cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes the runtime protection to be more general-case.

Browse Source
This commit is contained in:
SkyMarshal
2015-01-04 13:32:11 -07:00
parent 65163dfcc5
commit 863351a474
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/machinery/camera/camera.dm
View File

@@ -52,10 +52,8 @@
..() ..()
/obj/machinery/camera/Del() /obj/machinery/camera/Del()
// Tries to tell the location, but it's already been removed from the world. if(!alarm_on)
// Runtimes like MAD triggerCameraAlarm()
// if(!alarm_on)
// triggerCameraAlarm()
cancelCameraAlarm() cancelCameraAlarm()
..() ..()
@@ -259,12 +257,18 @@
/obj/machinery/camera/proc/triggerCameraAlarm() /obj/machinery/camera/proc/triggerCameraAlarm()
alarm_on = 1 alarm_on = 1
if(!get_area(src))
return
for(var/mob/living/silicon/S in mob_list) for(var/mob/living/silicon/S in mob_list)
S.triggerAlarm("Camera", get_area(src), list(src), src) S.triggerAlarm("Camera", get_area(src), list(src), src)
/obj/machinery/camera/proc/cancelCameraAlarm() /obj/machinery/camera/proc/cancelCameraAlarm()
alarm_on = 0 alarm_on = 0
if(!get_area(src))
return
for(var/mob/living/silicon/S in mob_list) for(var/mob/living/silicon/S in mob_list)
S.cancelAlarm("Camera", get_area(src), src) S.cancelAlarm("Camera", get_area(src), src)