Merge branch 'master' into shared_tasks

This commit is contained in:
Michael Cook (mackal)
2019-04-26 17:57:31 -04:00
23 changed files with 206 additions and 203 deletions
@@ -0,0 +1 @@
ALTER TABLE `npc_types` ADD COLUMN `model` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `stuck_behavior`;