summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-02-15 14:11:14 -0200
committershennetsind <ind@henn.et>2013-02-15 14:11:14 -0200
commit79f839d5a871a33512b7c6c700542d9e2192f696 (patch)
treecc8f4389590c937341c82c13f79cddf202ce7229 /npc
parent2c13a2a2dab83b3471bf5ce24371259012036e19 (diff)
parent657a2a794b4feb8d5202e2140a5e67075291d3e6 (diff)
downloadhercules-79f839d5a871a33512b7c6c700542d9e2192f696.tar.gz
hercules-79f839d5a871a33512b7c6c700542d9e2192f696.tar.bz2
hercules-79f839d5a871a33512b7c6c700542d9e2192f696.tar.xz
hercules-79f839d5a871a33512b7c6c700542d9e2192f696.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'npc')
-rw-r--r--npc/scripts_mapflags.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf
index ee6bd74e5..429578f1a 100644
--- a/npc/scripts_mapflags.conf
+++ b/npc/scripts_mapflags.conf
@@ -17,7 +17,7 @@ npc: conf/mapflag/noreturn.txt
npc: conf/mapflag/noskill.txt
npc: conf/mapflag/nowarp.txt
npc: conf/mapflag/nowarpto.txt
-//npc: conf/mapflag/partylock.txt
+npc: conf/mapflag/partylock.txt
npc: conf/mapflag/pvp.txt
npc: conf/mapflag/pvp_noparty.txt
npc: conf/mapflag/pvp_noguild.txt
@@ -27,3 +27,5 @@ npc: conf/mapflag/battleground.txt
npc: conf/mapflag/novending.txt
npc: conf/mapflag/town.txt
npc: conf/mapflag/reset.txt
+//npc: conf/mapflag/skillmodifier.txt
+//npc: conf/mapflag/skillduration.txt \ No newline at end of file