summaryrefslogtreecommitdiff
path: root/npc/re/merchants/card_separation.txt
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-12-31 23:40:48 +0100
committerHaru <haru@dotalux.com>2015-12-31 23:40:48 +0100
commit0e990045fc308ca58421eda25838d3b9e7a10afa (patch)
tree7966898e283b6759f226bd8222de161fb64772c2 /npc/re/merchants/card_separation.txt
parente95c473c694f4fccb40584f3e6a00323f91e36ee (diff)
parent32a42eeee18b16d9f904a409974dda575f3966c2 (diff)
downloadhercules-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/re/merchants/card_separation.txt')
-rw-r--r--npc/re/merchants/card_separation.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt
index ecd4f1fdd..0bf72f884 100644
--- a/npc/re/merchants/card_separation.txt
+++ b/npc/re/merchants/card_separation.txt
@@ -33,7 +33,7 @@
//= 1.1
//=========================================================================
-- script ::CardSeparation_mal -1,{
+- script ::CardSeparation_mal FAKE_NPC,{
disable_items;
if (checkweight(Knife,1) == 0) {
mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";