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/re/merchants/ammo_boxes.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/re/merchants/ammo_boxes.txt')
| -rw-r--r-- | npc/re/merchants/ammo_boxes.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/re/merchants/ammo_boxes.txt b/npc/re/merchants/ammo_boxes.txt index ba9e4fd96..432e0c8a4 100644 --- a/npc/re/merchants/ammo_boxes.txt +++ b/npc/re/merchants/ammo_boxes.txt @@ -11,9 +11,9 @@ //= 1.1 Added Izlude duplicates. [Euphy] //============================================================ -que_ng,187,149,3 duplicate(mdk) Magazine Dealer Kenny#ng 83 -izlude,74,104,3 duplicate(mdk) Magazine Dealer Kenny#iz 83 -izlude_a,74,104,3 duplicate(mdk) Magazine Dealer Kenny#a 83 -izlude_b,74,104,3 duplicate(mdk) Magazine Dealer Kenny#b 83 -izlude_c,74,104,3 duplicate(mdk) Magazine Dealer Kenny#c 83 -izlude_d,74,104,3 duplicate(mdk) Magazine Dealer Kenny#d 83 +que_ng,187,149,3 duplicate(mdk) Magazine Dealer Kenny#ng 4_M_01 +izlude,74,104,3 duplicate(mdk) Magazine Dealer Kenny#iz 4_M_01 +izlude_a,74,104,3 duplicate(mdk) Magazine Dealer Kenny#a 4_M_01 +izlude_b,74,104,3 duplicate(mdk) Magazine Dealer Kenny#b 4_M_01 +izlude_c,74,104,3 duplicate(mdk) Magazine Dealer Kenny#c 4_M_01 +izlude_d,74,104,3 duplicate(mdk) Magazine Dealer Kenny#d 4_M_01 |