Some pretty awesome fire/airalarm fixes

code/WorkInProgress/Mini/atmos_control.dm

@@ -14,25 +14,6 @@
 	var/overridden = 0 //not set yet, can't think of a good way to do it
 	req_one_access = list(access_ce)
 
-/*
-/obj/machinery/computer/atmoscontrol/xeno
-	name = "\improper Xenobiology Atmospherics Computer"
-	filter=list(
-		/area/toxins/xenobiology/specimen_1,
-		/area/toxins/xenobiology/specimen_2,
-		/area/toxins/xenobiology/specimen_3,
-		/area/toxins/xenobiology/specimen_4,
-		/area/toxins/xenobiology/specimen_5,
-		/area/toxins/xenobiology/specimen_6)
-	req_one_access = list(access_xenobiology,access_ce)
-
-
-/obj/machinery/computer/atmoscontrol/gas_chamber
-	name = "\improper Gas Chamber Atmospherics Computer"
-	filter=list(
-		/area/security/gas_chamber)
-	req_one_access = list(access_ce,access_hos)
-*/
 
 /obj/machinery/computer/atmoscontrol/attack_ai(var/mob/user as mob)
 	src.add_hiddenprint(user)
@@ -104,7 +85,7 @@
 
 		var/list/alarm_data=list()
 		alarm_data["ID"]="\ref[alarm]"
-		alarm_data["danger"] = max(alarm.danger_level, alarm.alarm_area.atmosalm)
+		alarm_data["danger"] = max(alarm.local_danger_level, alarm.alarm_area.atmosalm-1)
 		alarm_data["name"] = "[alarm]"
 		alarms+=list(alarm_data)
 	data["alarms"]=alarms
@@ -239,15 +220,15 @@
 					current.air_doors_open(1)
 
 		if(href_list["atmos_alarm"])
-			if (current.alarm_area.atmosalert(2))
-				current.apply_danger_level(2)
+			current.alarmActivated=1
+			current.alarm_area.updateDangerLevel()
 			spawn(1)
 				src.updateUsrDialog()
 			current.update_icon()
 			return
 		if(href_list["atmos_reset"])
-			if (current.alarm_area.atmosalert(0))
-				current.apply_danger_level(0)
+			current.alarmActivated=0
+			current.alarm_area.updateDangerLevel()
 			spawn(1)
 				src.updateUsrDialog()
 			current.update_icon()