Lemongrass3110 39367c75f5 Merge branch 'master' into hotfix/issue6912 ...

# Conflicts:
#	src/map/packets.hpp
#	src/map/pc.hpp

2022-11-30 22:17:09 +01:00

..

airports

Suggestion: NPC name as parameter in enablenpc (#6233)

2021-09-09 14:50:24 +02:00

battleground

Fixes Battlegrounds and atcommand reloadscript (#7002)

2022-06-02 20:38:26 -04:00

cities

Remove unclosed npc script code blocks (#7330)

2022-10-07 13:47:57 +07:00

custom

Update Autopot NPC (#7308)

2022-10-12 23:27:24 +02:00

events

Fix typos (#7421)

2022-11-09 15:59:40 +07:00

guild

Fixed wrong replacements of CD_CURRENT_ECONOMY (#3764)

2018-12-18 17:16:59 +01:00

guild2

Update agit_start_se.txt (#7448)

2022-11-30 22:07:43 +01:00

instances

Small correction in SealedShrine.txt (#6287)

2021-10-06 00:27:33 +02:00

jobs

Updated Gunslinger Job Change Quest Reward Items (#7223)

2022-09-12 10:49:04 +01:00

kafras

Small correction for checkre script command (#5550)

2020-11-16 17:51:30 +01:00

mapflag

Block dynamic NPCs in instances (#7429)

2022-11-10 22:14:42 +01:00

merchants

Jewelers across the server now sells more jewel items (#7320)

2022-10-03 12:36:32 +07:00

mobs

Removes an invalid mob death event (#4821)

2020-04-19 14:07:01 -04:00

other

Merge branch 'master' into hotfix/issue6912

2022-11-20 19:10:31 +01:00

pre-re

Follow up to 39b3e5fe29de9d1be65d9f6ec7eed9b6cfaec997

2022-10-03 12:46:07 +07:00

quests

Fix typos (#7421)

2022-11-09 15:59:40 +07:00

re

Removed duplicates list of menu items (#7459)

2022-11-29 14:24:24 +01:00

test

Itemlink command and integration (#7291)

2022-11-11 18:04:41 +01:00

warps

Implementing Stylist UI Script (#6506)

2022-01-20 01:07:20 +01:00

barters.yml

Initial release of barter shops (#6508)

2022-01-21 00:59:16 +01:00

scripts_athena.conf

Initial implementation of the goldpc timer

2022-11-07 01:50:44 +01:00

scripts_custom.conf

…

scripts_guild.conf

Fixed place names and other typos (#4475)

2019-12-15 20:55:19 +01:00

scripts_jobs.conf

Merged novice academie from Hercules 21564acf13

2015-11-16 00:34:00 +01:00

scripts_mapflags.conf

Added skill_duration mapflag. (#2171)

2018-10-26 08:52:49 -04:00

scripts_monsters.conf

Removed City Cleaners from RE monster spawn files (#3082)

2018-05-19 11:36:59 -04:00

scripts_test.conf

…

scripts_warps.conf

…