summaryrefslogtreecommitdiff
path: root/npc/merchants
AgeCommit message (Expand)AuthorFilesLines
2016-01-17Script Standardization: changed select format in merchants folderDastgir27-126/+126
2016-01-03Update morroc trader npc's to match kRO's morroc trader npc's.Jedzkie1-60/+1
2016-01-03Update Prontera trader npc's to match kRO's trader npc's.Jedzkie1-62/+1
2015-12-31Replace -1,{ with FAKE_NPC,{AnnieRuru5-7/+7
2015-12-22NPC Update:Jedzkie2-24/+30
2015-12-18ItemID to Constant: kafras/merchants FolderDastgir18-139/+139
2015-12-15Standardized header in scripts (part 6)Haru30-797/+1187
2015-09-25More aggressive whitespace cleanup. Follow up to 51329e6Haru2-2/+2
2015-06-25Updated Buying Shops scriptDastgir1-1/+11
2015-05-08Replaced checkre() calls with constantsHaru2-4/+3
2015-03-03Updated socket_enchant2.txt to contain ninja itemDastgir1-1/+2
2015-03-03Updated ninja shopDastgir1-0/+8
2015-01-11Added check for Renewal items in Shop, Fixed #8484Dastgir1-2/+4
2014-12-30Merge pull request #325 from happyme9/mastermalufett1-0/+2
2014-11-02Replaced 'set' with direct assignment where applicable (common folder)Haru20-259/+259
2014-10-31Follow-up to c6f102e (fixed a typo)Haru1-1/+1
2014-10-30Deprecated checkriding and setriding commandsHaru1-6/+6
2014-10-24Renamed ismounting, setmounting, @mount2Haru1-4/+2
2014-08-21Added Kagerou ToolsHappy1-0/+2
2014-05-13Removed trailing whitespace (scripts)Haru9-21/+21
2014-05-13Fixed several files with a missing EOL at EOFHaru3-3/+3
2013-12-24Christmas Patch - 2013-12-23 Supportshennetsind1-182/+2058
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke19-57/+57
2013-11-28Revert "Cleaned up Zeny manipulation in scripts."Haru19-57/+57
2013-11-25Cleaned up Zeny manipulation in scripts.Taylor Locke19-57/+57
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru1-2/+2
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru5-19/+19
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ...Kisuka30-294/+294
2013-10-24Follow up 418dd821c91ae19723a7b7b531e64b9c4565d555shennetsind1-1/+1
2013-10-24Update to last rAthena npc.Michieru29-677/+559
2013-10-11Moscovia Quest Update / Catalog Magician Moveshennetsind1-99/+5
2013-09-16Corrected line endings and BOM issues with several filesHaru7-8/+8
2013-07-04Merged/Updated/Added scripts from rAthena.j-tkay2-21/+6
2013-05-28Woohooo! Some more cleaning up!Mysteries1-2/+2
2013-05-28Follow up from my last commit.Masao1-176/+283
2013-05-27- Added custom HD Refiner NPC Dwarf Mighty Hammer. (Disabled by default.)Masao1-0/+211
2013-04-15Fixed Bug #7154shennetsind1-1/+1
2013-04-11* Initial implementation of Archangel Wing Enchants script.euphyy1-0/+2
2013-02-25* Part one of fixing bugreport:6527. This does not yet change functionality.euphyy6-9/+26
2013-02-18-Updated map_cache.datStreusel1-3/+2
2013-02-03Follow up to 2f02be9Mysteries1-1/+1
2013-02-03Merged rAthena r17103Mysteries1-87/+119
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries28-78/+34
2013-01-29Updated placeholders.Mysteries7-21/+7
2012-12-27> Follow-up r17048:euphyy1-3/+3
2012-12-24> Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:euphyy2-615/+27
2012-11-25* Added the "Catalog Magician" NPC to merchants/buying_shops.txt, thanks to M...euphyy1-91/+178
2012-10-10* Added Kagerou/Oboro support to Ninja Quests and Kunai Merchant (credits to ...euphyy1-2/+3
2012-09-26Updated Items, Uncommented the Traditional Cookie as it works fine and is nee...spre1231-2/+2
2012-09-24Updated Pet Groomer Shops.txt with the new Items they were missing.(Prontera,...spre1231-3/+4