Merges AI Branch into Master

This commit is contained in:
Atermonera
2018-12-01 00:06:38 -05:00
committed by VirgoBot
parent 15017e893e
commit 2df5e9fe0e
379 changed files with 22460 additions and 4751 deletions
+1 -1
View File
@@ -18,7 +18,7 @@
//OTHER//
/////////
var/datum/preferences/prefs = null
var/move_delay = 1
//var/move_delay = 1
var/moving = null
var/adminobs = null
var/area = null
@@ -370,4 +370,4 @@
/datum/gear/head/circuitry
display_name = "headwear, circuitry (empty)"
path = /obj/item/clothing/head/circuitry
path = /obj/item/clothing/head/circuitry