diff options
| author | nmaligec <wouldnot@hotmail.com> | 2011-01-05 00:34:26 -0500 |
|---|---|---|
| committer | nmaligec <wouldnot@hotmail.com> | 2011-01-05 00:34:26 -0500 |
| commit | ed8cac19500c515cae40c1fd4b2d87abd96ae3ba (patch) | |
| tree | 3136c4b4bac4db3a432384390efcc22f88ff2790 /npc/scripts.conf | |
| parent | 21156bed9c3d6eb3cf66a1e1557f4fc8c87a4194 (diff) | |
| parent | 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b (diff) | |
| download | serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.gz serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.bz2 serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.xz serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.zip | |
merging updates from previous test repo ta-testing.
Diffstat (limited to 'npc/scripts.conf')
| -rw-r--r-- | npc/scripts.conf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/npc/scripts.conf b/npc/scripts.conf index acda50a6..42622c1b 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -18,6 +18,8 @@ npc: npc/functions/evil_obelisk.txt // Item Functions npc: npc/items/purification_potion.txt +npc: npc/items/scissors.txt +npc: npc/items/shock_sweet.txt npc: npc/items/unreleased_item.txt npc: npc/items/restricted_item.txt @@ -73,3 +75,8 @@ import: npc/_import.txt // Easter 2010 // When enabling, some entries in 028-1 would also need to be uncommented, the warp from 028-1 would need to be commented out. The changes to the old woman and some other NPCs weren't able to be preserved, but are recorded in the git repository. //import: npc/easter/2010/_import.txt + +// Halloween 2010 +// npc: npc/halloween/2010/gak.txt + +// import: npc/xmas/2010/_import.txt |