diff options
author | shennetsind <ind@henn.et> | 2013-02-03 12:28:05 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-02-03 12:28:05 -0200 |
commit | 654ba93647779819b64ba7920cedd73b45c0a419 (patch) | |
tree | f895826aa817a0ce40633252c1c54299ea8fe33b /npc/merchants | |
parent | a4a549da77879c142ed9fe667ed312dfa6e6b70a (diff) | |
parent | b815c12bd2f0e4a4ee3af336982ee28250c38e92 (diff) | |
download | hercules-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 'npc/merchants')
-rw-r--r-- | npc/merchants/alchemist.txt | 4 | ||||
-rw-r--r-- | npc/merchants/ammo_boxes.txt | 4 | ||||
-rw-r--r-- | npc/merchants/ammo_dealer.txt | 4 | ||||
-rw-r--r-- | npc/merchants/buying_shops.txt | 4 | ||||
-rw-r--r-- | npc/merchants/cash_hair.txt | 4 | ||||
-rw-r--r-- | npc/merchants/cash_trader.txt | 4 | ||||
-rw-r--r-- | npc/merchants/cashheadgear_dye.txt | 4 |
7 files changed, 7 insertions, 21 deletions
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index b99f7bf25..d3506244d 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Alchemist Shop //===== By: ================================================== //= rAthena Team //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Selling Alchemist Materials and Manuals //===== Additional Comments: ================================= diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt index fadf8b03f..75d203123 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Magazine Dealer Kenny //===== By: ================================================== //= rAthena dev team //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Turns bullets into magazines/packs. //===== Additional Comments: ================================= diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index 71f189c6e..b9d515ad4 100644 --- a/npc/merchants/ammo_dealer.txt +++ b/npc/merchants/ammo_dealer.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Bullet Dealer Tony //===== By =================================================== //= Playtester, Paradox924X //===== Version ============================================== //= 1.5 -//===== Compatible With ====================================== -//= rAthena SVN //===== Description ========================================== //= Bullet trader. //===== Comments ============================================= diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt index 4e9065b8e..93e7d0f0b 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Buying Shop Scripts //===== By: ================================================== //= Kisuka, skyiing, Scriptor //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Buying Shop licenses and catalogs. //===== Additional Comments: ================================= diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt index 168445fa0..3028d302d 100644 --- a/npc/merchants/cash_hair.txt +++ b/npc/merchants/cash_hair.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Cash Hair Stylist //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Exchange cash item, New_Style_Coupon, for new hair styles. //===== Additional Comments: ================================= diff --git a/npc/merchants/cash_trader.txt b/npc/merchants/cash_trader.txt index 2de6e794e..1063800f6 100644 --- a/npc/merchants/cash_trader.txt +++ b/npc/merchants/cash_trader.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Cash Shop NPCs //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Sell Cash shop items. //= Based on iRO's Cash shop. Headgears omitted. diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt index fa309738a..e0887b30e 100644 --- a/npc/merchants/cashheadgear_dye.txt +++ b/npc/merchants/cashheadgear_dye.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Headgear Dyer (Cash) //===== By: ================================================== //= Xantara //= Maud_Dib //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Change headgear's color. Cost is a Mysterious Dyestuff |