summaryrefslogtreecommitdiff
path: root/npc/other/marriage.txt
AgeCommit message (Collapse)AuthorFilesLines
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial1231-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-18Applied patch from Dani to change NPC emotion events to use the updated ↵L0ne_W0lf1-36/+12
emotion command. (bugreport:4318) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14347 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-25* Corrected Luna Bow Bonuses. (bugreport:1919)L0ne_W0lf1-12/+12
* Swapped dis/enable for hideon/off in wedding script. * Corrected Slotting NPCs triggering on touch. (bugreport:1916) * Added a missing close in juperos quest. (bugreport:1918) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12993 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-08* Various fixes to NPCs, from bugreports.L0ne_W0lf1-3/+4
- Fixed condition error in old pharmacist. (bugreport:597) - Fixed missing function in novice WoE (bugreport:1728) - Fixed a minor errors in dancer quest (bugreport:1766) - Corrected duration of wedding status (bugreport:1775) - Fixed missing function in novice WoE (bugreport:1788) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12925 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-23random fixingultramage1-838/+838
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10808 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-14* Fixed a missing ")" in the new wedding script.L0ne_W0lf1-837/+838
* Forgot to upload the mail.txt file. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10767 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-14* Updated cities: Morroc, Jawaii, and IzludeL0ne_W0lf1-881/+777
- Moved an NPC out of Prontera because of the Jawaii update. * Updated Wedding script to official. (Moved previous to custom.) - Updated the Divorce NPC to Official as well. * Changed some dialog in the Kafra Functions. * Updated the Message boards to iRO standards. * Added the Mail box NPCs even though the mail system is not implemented. * Near total rewrite of the shops.txt file. Lots of corrections and such. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10766 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-02Spring cleaning in sql-files/DracoRPG1-10/+15
Officialized a very small bit of the wedding NPC git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10133 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-15removed all .GAT from all the scripts and testedLupus1-3/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10018 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-05- Massive EOL normalization & 'svn:eol-style native' flag setting for all ↵FlavioJS1-936/+936
txt/conf/h/c files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-20- Removed security check since source level patch is applied. Reverted ↵Lance1-9/+1
select(), created prompt(). modified Changelog-Trunk.txt modified npc/airports/airships.txt modified npc/cities/amatsu.txt modified npc/cities/gonryun.txt modified npc/cities/hugel.txt modified npc/cities/lighthalzen.txt modified npc/cities/niflheim.txt modified npc/cities/valkyrie.txt modified npc/custom/eAAC_Scripts/disguiser.txt modified npc/custom/eAAC_Scripts/quest_warper.txt modified npc/custom/jobs/jobmaster.txt modified npc/events/idul_fitri.txt modified npc/jobs/1-1e/gunslinger.txt modified npc/jobs/1-1e/ninja.txt modified npc/jobs/novice/novice.txt modified npc/merchants/kunai_maker.txt modified npc/merchants/novice_exchange.txt modified npc/merchants/refine.txt modified npc/other/comodo_gambling.txt modified npc/other/dts_warper.txt modified npc/other/marriage.txt modified npc/other/powernpc.txt modified npc/quests/Lvl4_weapon_quest.txt modified npc/quests/gunslinger_quests.txt modified npc/quests/quests_ein.txt modified npc/quests/quests_umbala.txt modified npc/sample/monster_controller.cpp modified src/map/script.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9267 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-19Updated scripts with select().. THERE ARE TONS OF THEM!! Will somebody give ↵Lance1-1/+9
me a hand or something? :B git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9259 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-10-30- Updated the npc/other/marriage.txt wedding script with the most current ↵skotlex1-20/+31
version. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9103 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-03-02* Added Skotlex's updated marriage script [Vicious]Vicious1-553/+631
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5433 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29AS OF SVN REV. 5901, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES ↵Valaris1-0/+847
GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EVERYTHING ELSE GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5094 54d463be-8e91-2dee-dedb-b68131a5f0ec