diff options
author | Haru <haru@dotalux.com> | 2016-02-22 00:09:28 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2016-02-22 00:09:28 +0100 |
commit | 540b4b0a29cbfbab4df73e4be4f86d9024a48959 (patch) | |
tree | 632f5197870f8d2e5f973010564893bc02e691a4 /npc/re/merchants/ammo_dealer.txt | |
parent | 3023f509a563f65f624248c5b233472e519c4d10 (diff) | |
parent | 2824860863d78bcf02954e86a1e6540d125910b1 (diff) | |
download | hercules-540b4b0a29cbfbab4df73e4be4f86d9024a48959.tar.gz hercules-540b4b0a29cbfbab4df73e4be4f86d9024a48959.tar.bz2 hercules-540b4b0a29cbfbab4df73e4be4f86d9024a48959.tar.xz hercules-540b4b0a29cbfbab4df73e4be4f86d9024a48959.zip |
Merge branch 'Jedzkie-NPC_Updates' into hercules
Closes #1062 as merged
Diffstat (limited to 'npc/re/merchants/ammo_dealer.txt')
-rw-r--r-- | npc/re/merchants/ammo_dealer.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/npc/re/merchants/ammo_dealer.txt b/npc/re/merchants/ammo_dealer.txt index 87d641910..6b273371d 100644 --- a/npc/re/merchants/ammo_dealer.txt +++ b/npc/re/merchants/ammo_dealer.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team +//= Copyright (C) 2012-2016 Hercules Dev Team //= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify @@ -29,12 +29,8 @@ //================= Description =========================================== //= Bullet trader. //================= Current Version ======================================= -//= 1.1 +//= 1.2 //========================================================================= que_ng,187,156,3 duplicate(bdt) Bullet Dealer Tony#ng 4_M_04 -izlude,77,104,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04 //Official: (74,106) -> in the water -izlude_a,77,104,3 duplicate(bdt) Bullet Dealer Tony#a 4_M_04 -izlude_b,77,104,3 duplicate(bdt) Bullet Dealer Tony#b 4_M_04 -izlude_c,77,104,3 duplicate(bdt) Bullet Dealer Tony#c 4_M_04 -izlude_d,77,104,3 duplicate(bdt) Bullet Dealer Tony#d 4_M_04 +izlude_in,74,106,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04 |