diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
| commit | 7f4410f9d5dce2884368a4b1d01139abd2e65fd5 (patch) | |
| tree | e4f6cd0f6ed40b1852fa5ce28a5d78be982b0a73 /world/map/npc/021-1/npcs.txt | |
| parent | 8ac35610a416d3937ccf4b3b74a61622382e8162 (diff) | |
| parent | fa2ffc29c1ef2c33ff0a9c1baf7026a4d9ffe0b6 (diff) | |
| download | serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.gz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.bz2 serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.xz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/021-1/npcs.txt')
| -rw-r--r-- | world/map/npc/021-1/npcs.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/021-1/npcs.txt b/world/map/npc/021-1/npcs.txt index 89a3111e..662a69e2 100644 --- a/world/map/npc/021-1/npcs.txt +++ b/world/map/npc/021-1/npcs.txt @@ -10,7 +10,7 @@ close; } -021-1.gat,75,67,0|script|Silvia|207,{ +021-1.gat,76,67,0|script|Silvia|207,{ set @npcname$, "Silvia"; mes "[" + @npcname$ + "]"; @@ -22,7 +22,7 @@ close; } -021-1.gat,45,77,0|script|Pauline|208,{ +021-1.gat,55,66,0|script|Pauline|208,{ set @npcname$, "Pauline"; mes "[" + @npcname$ + "]"; @@ -32,7 +32,7 @@ close; } -021-1.gat,49,123,0|script|Michel|215,{ +021-1.gat,51,123,0|script|Michel|215,{ set @npcname$, "Michel"; mes "[" + @npcname$ + "]"; |