diff options
author | shennetsind <ind@henn.et> | 2013-09-16 08:12:48 -0300 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-09-16 08:12:48 -0300 |
commit | 5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7 (patch) | |
tree | da13821a29480d88dcd872c682b26b75e5191482 /npc/quests | |
parent | 4eb223b62e70a293dd2c95f1ce8b29a3f0c83ef7 (diff) | |
parent | fe2f840e5d6cb4230ba02c47132790d067b3814d (diff) | |
download | hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.gz hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.bz2 hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.xz hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Solved minor conflicts that were caused by the unit interface
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'npc/quests')
-rw-r--r-- | npc/quests/kiel_hyre_quest.txt | 2 | ||||
-rw-r--r-- | npc/quests/mage_solution.txt | 2 | ||||
-rw-r--r-- | npc/quests/quests_13_1.txt | 2 | ||||
-rw-r--r-- | npc/quests/thana_quest.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt index 3f5a3ddf5..2940951fe 100644 --- a/npc/quests/kiel_hyre_quest.txt +++ b/npc/quests/kiel_hyre_quest.txt @@ -7231,4 +7231,4 @@ OnInit: //= to after finishing the quest. //= 3.7 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 3.8 Corrected some delitems. (bugreport:690) [Samuray22] -//= 3.9 Fixed a cutin not being erased. (bugreport:1539) [L0ne_W0lf]
\ No newline at end of file +//= 3.9 Fixed a cutin not being erased. (bugreport:1539) [L0ne_W0lf] diff --git a/npc/quests/mage_solution.txt b/npc/quests/mage_solution.txt index b29fd4416..0eb3b101a 100644 --- a/npc/quests/mage_solution.txt +++ b/npc/quests/mage_solution.txt @@ -39,4 +39,4 @@ pay_arche,122,100,0 script Dollshoi 88,{ getitem 1089,1; //Payon_Potion } close; -}
\ No newline at end of file +} diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 523b5ff00..ddb7a3eea 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -14989,4 +14989,4 @@ prontera,161,192,5 script Ash Vacuum Warper 707,{ } end; } -*/
\ No newline at end of file +*/ diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index 362695bef..b9a251d6c 100644 --- a/npc/quests/thana_quest.txt +++ b/npc/quests/thana_quest.txt @@ -2312,4 +2312,4 @@ OnTouch: } mes "A mysterious power is blocking my path."; close; -}
\ No newline at end of file +} |