Bay Merge 05NOV2014

Known errors:

* A set of errors tied to updating the fire overlays.
* A single error related to a dischephency between new and old slime
code
* A set of errors related to the recharging of stun batons
* A single error due to old machinery code coming from your grav
generator file
* A single error error from your space cooler code, due to old
atmopsherics code
* A playerpanel warning
* An error tied to extinguishing and old atmos code.
This commit is contained in:
skull132
2014-11-05 23:58:05 +02:00
parent b7174a5099
commit 3c04d7199d
535 changed files with 29846 additions and 17593 deletions
+9 -7
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)
@@ -156,12 +156,14 @@
src.updateUsrDialog()
return
if(href_list["atmos_unlock"])
switch(href_list["atmos_unlock"])
if("0")
current.air_doors_close(1)
if("1")
current.air_doors_open(1)
//commenting this out because it causes compile errors
//I tried fixing it but wasn't sucessful.
//if(href_list["atmos_unlock"])
// switch(href_list["atmos_unlock"])
// if("0")
// current.alarm_area.air_doors_close()
// if("1")
// current.alarm_area.air_doors_open()
if(href_list["atmos_alarm"])
if (current.alarm_area.atmosalert(2))