Merges AI Branch into Master

This commit is contained in:
Atermonera
2018-11-30 21:05:42 -08:00
committed by VirgoBot
parent 15017e893e
commit 2df5e9fe0e
379 changed files with 22460 additions and 4751 deletions
+1 -1
View File
@@ -15,7 +15,7 @@
floor_type = /turf/simulated/floor/reinforced
var/list/supplied_drop_types = list()
var/door_type = /obj/structure/droppod_door
var/drop_type = /mob/living/simple_animal/parrot
var/drop_type = /mob/living/simple_mob/animal/passive/bird/parrot
var/auto_open_doors
var/placement_explosion_dev = 1