diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
| commit | c9173a4e2e55b0fdf4df0d99920c556548a81e4b (patch) | |
| tree | 885d66f5e10289843fa71a4316fe49a454c47c01 /npc/000-0 | |
| parent | 9222961a0b3b38aee2f01a1d53c8a08e174488e2 (diff) | |
| parent | 7c8417bb63afb65516852da1b9eb8ff0b4d2877f (diff) | |
| download | serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.gz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.bz2 serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.xz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.zip | |
Merge branch 'master' into testserver
Conflicts solved with -X theirs
Diffstat (limited to 'npc/000-0')
| -rw-r--r-- | npc/000-0/sailors.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index c50f687b9..de33b9d59 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -87,9 +87,7 @@ OnTouch: l("(Don't respond)"); mes ""; - Karma=100; if (@menu == 1) { - Karma=Karma-1; mesn l("Sailor"); mesq l("What do you mean? Do you at least have a rowboat with you?!"); next; @@ -97,7 +95,7 @@ OnTouch: mesq l("We can't let you die from hunger! That wouldn't be cool at all! And I'm very cool!"); next; } else if (@menu == 2) { - Karma=Karma+1; + mes ""; // You don't need to thank us! } else { mesn l("Sailor"); mesq lg("Oh noes! She fainted! Quick, rescue her!!", "Oh noes! He fainted! Quick, rescue him!!"); |