diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:42:48 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:42:48 -0400 |
| commit | ea7d999c39ead96efb6d9af7e68794c59290cf60 (patch) | |
| tree | 771e06363fe2e7609847a0a63a2e499632d3d7a2 /world/map/npc/scripts.conf | |
| parent | 9e7f46ac732851c1359a15837c82ebf67ea2be39 (diff) | |
| parent | 91fe3711fcacdfe83794b4347595e56e90e9d3a7 (diff) | |
| download | serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.tar.gz serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.tar.bz2 serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.tar.xz serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.zip | |
Merge self-fork from mekolat/magic-v3
Magic v3 spells
Diffstat (limited to 'world/map/npc/scripts.conf')
| -rw-r--r-- | world/map/npc/scripts.conf | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf index e9bceb20..0935f246 100644 --- a/world/map/npc/scripts.conf +++ b/world/map/npc/scripts.conf @@ -14,12 +14,9 @@ npc: npc/functions/mob_points.txt npc: npc/functions/process_equip.txt npc: npc/functions/slot_machine.txt npc: npc/functions/soul_menhir.txt -npc: npc/functions/strangerquiz.txt npc: npc/functions/time.txt npc: npc/functions/water_bottle.txt npc: npc/functions/evil_obelisk.txt -npc: npc/functions/debug.txt -npc: npc/functions/superdebug.txt npc: npc/functions/announcements.txt npc: npc/functions/lockpicking.txt npc: npc/functions/default_npc_checks.txt @@ -32,9 +29,9 @@ npc: npc/functions/dynamic_menu.txt npc: npc/functions/DyeConfig.txt npc: npc/functions/motd.txt npc: npc/functions/motdconfig.txt +npc: npc/functions/hug.txt // Item Functions -npc: npc/items/magic_gm_top_hat.txt npc: npc/items/purification_potion.txt npc: npc/items/scissors.txt npc: npc/items/pickled_beets.txt @@ -50,6 +47,12 @@ npc: npc/items/mirror.txt npc: npc/items/rubber_bat.txt import: npc/_import.txt +// magic +import: npc/magic/_import.txt + +// GM commands +import: npc/commands/_import.txt + // GM Events npc: npc/functions/gm_island.txt // Annuals Framework |