diff options
| author | Haru <haru@dotalux.com> | 2015-12-31 23:40:48 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-12-31 23:40:48 +0100 |
| commit | 0e990045fc308ca58421eda25838d3b9e7a10afa (patch) | |
| tree | 7966898e283b6759f226bd8222de161fb64772c2 /npc/cities/jawaii.txt | |
| parent | e95c473c694f4fccb40584f3e6a00323f91e36ee (diff) | |
| parent | 32a42eeee18b16d9f904a409974dda575f3966c2 (diff) | |
| download | hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.gz hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.bz2 hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.xz hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.zip | |
Merge branch 'AnnieRuru-request_29' into hercules
Closes #1000 as merged
Diffstat (limited to 'npc/cities/jawaii.txt')
| -rw-r--r-- | npc/cities/jawaii.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 2ac6b57b2..0c29442c6 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -692,7 +692,7 @@ OnSolo: end; } -jawaii_in,28,96,0 script jaw_em_order#Jawaii -1,3,3,{ +jawaii_in,28,96,0 script jaw_em_order#Jawaii FAKE_NPC,3,3,{ OnTouch: if (getpartnerid()) { donpcevent "Employee#jaw8::OnWelcome"; @@ -1399,7 +1399,7 @@ prt_in,170,14,0 script Customer#Bachewcca 4_M_ORIENT02,{ } //== Izlude ================================================ -- script ::Honeymoon_Helper_Izlude -1,{ +- script ::Honeymoon_Helper_Izlude FAKE_NPC,{ mes "[Helper]"; mes "Newlyweds and"; mes "long time couples..."; |