Merge with master.

This commit is contained in:
Zuhayr
2014-07-02 06:59:11 +09:30
5 changed files with 165 additions and 131 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
circuit = "/obj/item/weapon/circuitboard/atmoscontrol"
var/obj/machinery/alarm/current
var/overridden = 0 //not set yet, can't think of a good way to do it
req_access = list(access_ce)
req_access = list(access_atmospherics)
/obj/machinery/computer/atmoscontrol/attack_ai(var/mob/user as mob)