diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/custom/etc/penal_servitude.txt | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/custom/etc/penal_servitude.txt')
| -rw-r--r-- | npc/custom/etc/penal_servitude.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt index 7cfc55ee1..61dd80676 100644 --- a/npc/custom/etc/penal_servitude.txt +++ b/npc/custom/etc/penal_servitude.txt @@ -14,7 +14,7 @@ // 1.2 Stricted the conditions a bit //============================================================ -sec_pri,36,58,1 script Chief Warder 105,{ +sec_pri,36,58,1 script Chief Warder 8W_SOLDIER,{ mes "[Saddeus]"; emotion 1; if(sex) { @@ -127,7 +127,7 @@ M_NO_THANKS: close; } -sec_in02,137,57,1 script Overseer 708,{ +sec_in02,137,57,1 script Overseer 4_M_PAY_SOLDIER,{ mes "[Oliver]"; delitem 4002,countitem(4002);//Items: Fabre_Card, |