cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

mmm, yes, boilerplate

Browse Source
This commit is contained in:
Fox McCloud
2020-07-02 16:12:19 -04:00
parent de77c5d7b4
commit 52f902c474
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/station_alert.dm
+5 -5
View File
@@ -47,8 +47,8 @@
return data
/obj/machinery/computer/station_alert/proc/triggerAlarm(class, area/A, O, obj/source)
if(source.z != z)
/obj/machinery/computer/station_alert/proc/triggerAlarm(class, area/A, O, obj/alarmsource)
if(alarmsource.z != z)
return
if(stat & (BROKEN))
return
@@ -58,8 +58,8 @@
if(I == A.name)
var/list/alarm = L[I]
var/list/sources = alarm[3]
if(!(source in sources))
sources += source
if(!(alarmsource in sources))
sources += alarmsource
return TRUE
var/obj/machinery/camera/C = null
var/list/CL = null
@@ -69,7 +69,7 @@
C = CL[1]
else if(O && istype(O, /obj/machinery/camera))
C = O
L[A.name] = list(A, (C ? C : O), list(source))
L[A.name] = list(A, (C ? C : O), list(alarmsource))
update_icon()
return TRUE
code/modules/mob/living/silicon/ai/ai.dm
+6 -4
View File
@@ -820,6 +820,8 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
/mob/living/silicon/ai/triggerAlarm(class, area/A, O, obj/alarmsource)
if(alarmsource.z != z)
return
if(stat == DEAD)
return TRUE
var/list/L = alarms[class]
for(var/I in L)
if(I == A.name)
@@ -830,13 +832,13 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
return TRUE
var/obj/machinery/camera/C = null
var/list/CL = null
if(O && istype(O, /list))
if(O && islist(O))
CL = O
if(CL.len == 1)
C = CL[1]
else if(O && istype(O, /obj/machinery/camera))
C = O
L[A.name] = list(A, (C) ? C : O, list(alarmsource))
L[A.name] = list(A, (C ? C : O), list(alarmsource))
if(O)
if(C && C.can_use())
queueAlarm("--- [class] alarm detected in [A.name]! (<A HREF=?src=[UID()];switchcamera=[C.UID()]>[C.c_tag]</A>)", class)
@@ -857,7 +859,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
/mob/living/silicon/ai/cancelAlarm(class, area/A, obj/origin)
var/list/L = alarms[class]
var/cleared = 0
var/cleared = FALSE
for(var/I in L)
if(I == A.name)
var/list/alarm = L[I]
@@ -865,7 +867,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
if(origin in srcs)
srcs -= origin
if(srcs.len == 0)
cleared = 1
cleared = TRUE
L -= I
if(cleared)
queueAlarm("--- [class] alarm in [A.name] has been cleared.", class, 0)
code/modules/mob/living/silicon/robot/robot.dm
+2 -2
View File
@@ -644,13 +644,13 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
return TRUE
var/obj/machinery/camera/C = null
var/list/CL = null
if(O && istype(O, /list))
if(O && islist(O))
CL = O
if(CL.len == 1)
C = CL[1]
else if(O && istype(O, /obj/machinery/camera))
C = O
L[A.name] = list(A, (C) ? C : O, list(alarmsource))
L[A.name] = list(A, (C ? C : O), list(alarmsource))
queueAlarm(text("--- [class] alarm detected in [A.name]!"), class)
return TRUE
code/modules/modular_computers/file_system/programs/engineering/alarm.dm
+5 -7
View File
@@ -39,7 +39,7 @@
return data
/datum/computer_file/program/alarm_monitor/proc/triggerAlarm(class, area/A, O, obj/source)
/datum/computer_file/program/alarm_monitor/proc/triggerAlarm(class, area/A, O, obj/alarmsource)
if(is_station_level(source.z))
if(!(A.type in GLOB.the_station_areas))
return
@@ -51,21 +51,19 @@
if(I == A.name)
var/list/alarm = L[I]
var/list/sources = alarm[3]
if(!(source in sources))
sources += source
if(!(alarmsource in sources))
sources += alarmsource
return TRUE
var/obj/machinery/camera/C = null
var/list/CL = null
if(O && istype(O, /list))
if(O && islist(O))
CL = O
if(CL.len == 1)
C = CL[1]
else if(O && istype(O, /obj/machinery/camera))
C = O
L[A.name] = list(A, (C ? C : O), list(source))
L[A.name] = list(A, (C ? C : O), list(alarmsource))
update_alarm_display()
return TRUE