This commit is contained in:
Fox McCloud
2020-07-02 08:34:59 -04:00
parent 773190d262
commit 2fa1217d5c
5 changed files with 48 additions and 47 deletions

View File

@@ -48,17 +48,17 @@
var/list/L = alarms[class]
for(var/I in L)
if (I == A.name)
if(I == A.name)
var/list/alarm = L[I]
var/list/sources = alarm[3]
if (!(source in sources))
if(!(source in sources))
sources += source
return 1
return TRUE
var/obj/machinery/camera/C = null
var/list/CL = null
if(O && istype(O, /list))
CL = O
if (CL.len == 1)
if(CL.len == 1)
C = CL[1]
else if(O && istype(O, /obj/machinery/camera))
C = O
@@ -66,23 +66,23 @@
update_alarm_display()
return 1
return TRUE
/datum/computer_file/program/alarm_monitor/proc/cancelAlarm(class, area/A, obj/origin)
var/list/L = alarms[class]
var/cleared = 0
var/arealevelalarm = FALSE // set to TRUE for alarms that set/clear whole areas
if(class=="Fire")
if(class == "Fire")
arealevelalarm = TRUE
for(var/I in L)
if(I == A.name)
if(!arealevelalarm) // the traditional behaviour
var/list/alarm = L[I]
var/list/srcs = alarm[3]
if (origin in srcs)
if(origin in srcs)
srcs -= origin
if (srcs.len == 0)
if(srcs.len == 0)
cleared = 1
L -= I
else