diff options
| author | shennetsind <ind@henn.et> | 2013-09-16 08:12:48 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-16 08:12:48 -0300 |
| commit | 5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7 (patch) | |
| tree | da13821a29480d88dcd872c682b26b75e5191482 /npc/re/cities | |
| parent | 4eb223b62e70a293dd2c95f1ce8b29a3f0c83ef7 (diff) | |
| parent | fe2f840e5d6cb4230ba02c47132790d067b3814d (diff) | |
| download | hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.gz hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.bz2 hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.xz hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Solved minor conflicts that were caused by the unit interface
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'npc/re/cities')
| -rw-r--r-- | npc/re/cities/dicastes.txt | 2 | ||||
| -rw-r--r-- | npc/re/cities/jawaii.txt | 2 | ||||
| -rw-r--r-- | npc/re/cities/malangdo.txt | 2 | ||||
| -rw-r--r-- | npc/re/cities/malaya.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt index 5fd555b8f..c47671b4b 100644 --- a/npc/re/cities/dicastes.txt +++ b/npc/re/cities/dicastes.txt @@ -693,4 +693,4 @@ dic_in01,98,96,3 script Lost Galten#a 492,{ mes "¡ü¡ø¡ñ ¢£ "; mes "¡ö¡ï¢² ¡û ¡ö¡ó"; close; -}
\ No newline at end of file +} diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt index a4b584d3a..f1020b2f8 100644 --- a/npc/re/cities/jawaii.txt +++ b/npc/re/cities/jawaii.txt @@ -13,4 +13,4 @@ //= 1.1 Changed to Official coordinates [Streusel] //============================================================ -izlude,180,224,6 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71
\ No newline at end of file +izlude,180,224,6 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71 diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index 0ee7ca8be..76cc418cf 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -389,4 +389,4 @@ OnTouch: emotion e_flash; end; } -malangdo,164,203,3 duplicate(Cat Trainer#mal1) Cat Trainer#mal2 853,5,8
\ No newline at end of file +malangdo,164,203,3 duplicate(Cat Trainer#mal1) Cat Trainer#mal2 853,5,8 diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index dd5ca3101..30a38cf4d 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -1763,4 +1763,4 @@ malaya,257,58,6 script Jeepney Driver#09 582,{ "Since everybody have different tastes, you can see those with cool and elaborate decorations.", "Of course you don't need to drive them yourselves, but you can ride them so please feel free to do so." ); -}
\ No newline at end of file +} |