summaryrefslogtreecommitdiff
path: root/conf/mapflag/nopenalty.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-02-03 12:28:05 -0200
committershennetsind <ind@henn.et>2013-02-03 12:28:05 -0200
commit654ba93647779819b64ba7920cedd73b45c0a419 (patch)
treef895826aa817a0ce40633252c1c54299ea8fe33b /conf/mapflag/nopenalty.txt
parenta4a549da77879c142ed9fe667ed312dfa6e6b70a (diff)
parentb815c12bd2f0e4a4ee3af336982ee28250c38e92 (diff)
downloadhercules-654ba93647779819b64ba7920cedd73b45c0a419.tar.gz
hercules-654ba93647779819b64ba7920cedd73b45c0a419.tar.bz2
hercules-654ba93647779819b64ba7920cedd73b45c0a419.tar.xz
hercules-654ba93647779819b64ba7920cedd73b45c0a419.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'conf/mapflag/nopenalty.txt')
-rw-r--r--conf/mapflag/nopenalty.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
index 2517a3759..083d86105 100644
--- a/conf/mapflag/nopenalty.txt
+++ b/conf/mapflag/nopenalty.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
//= Mapflag: Disable death penalty.
//===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
//===== Current Version: =====================================
//= 1.4
-//===== Compatible With: =====================================
-//= rAthena SVN
//===== Description: =========================================
//= Same as 'noexppenalty' and 'nozenypenalty' combined.
//===== Additional Comments: =================================