From 2a466d2415f2e462e3c56077570e2651ab198dbe Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Fri, 26 Feb 2021 15:29:50 +0100
Subject: [PATCH] camera alarm removal go brrr
---
code/controllers/subsystem/alarm.dm | 2 +-
code/game/machinery/camera/camera.dm | 18 ------------------
code/modules/mob/living/silicon/ai/ai.dm | 2 +-
code/modules/mob/living/silicon/silicon.dm | 12 +++---------
4 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/code/controllers/subsystem/alarm.dm b/code/controllers/subsystem/alarm.dm
index 3d91d763be3..7ac7ab389a8 100644
--- a/code/controllers/subsystem/alarm.dm
+++ b/code/controllers/subsystem/alarm.dm
@@ -1,7 +1,7 @@
SUBSYSTEM_DEF(alarm)
name = "Alarm"
flags = SS_NO_INIT | SS_NO_FIRE
- var/list/alarms = list("Motion" = list(), "Fire" = list(), "Atmosphere" = list(), "Power" = list(), "Camera" = list(), "Burglar" = list())
+ var/list/alarms = list("Motion" = list(), "Fire" = list(), "Atmosphere" = list(), "Power" = list(), "Burglar" = list())
/datum/controller/subsystem/alarm/proc/triggerAlarm(class, area/A, list/O, obj/alarmsource)
var/list/L = alarms[class]
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 1d4b59acdf9..8a04c310e17 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -66,7 +66,6 @@
if(istype(A))
A.motioncameras -= src
area_motion = null
- cancelCameraAlarm()
cancelAlarm()
return ..()
@@ -86,7 +85,6 @@
var/thisemp = emped //Take note of which EMP this proc is for
spawn(900)
if(!QDELETED(src))
- triggerCameraAlarm() //camera alarm triggers even if multiple EMPs are in effect.
if(emped == thisemp) //Only fix it if the camera hasn't been EMP'd again
network = previous_network
stat &= ~EMPED
@@ -94,9 +92,6 @@
if(can_use())
GLOB.cameranet.addCamera(src)
emped = 0 //Resets the consecutive EMP count
- spawn(100)
- if(!QDELETED(src))
- cancelCameraAlarm()
for(var/mob/M in GLOB.player_list)
if(M.client && M.client.eye == src)
M.unset_machine()
@@ -229,7 +224,6 @@
/obj/machinery/camera/obj_break(damage_flag)
if(status && !(flags & NODECONSTRUCT))
- triggerCameraAlarm()
toggle_cam(null, FALSE)
wires.cut_all()
@@ -275,10 +269,6 @@
var/change_msg = "deactivates"
if(status)
change_msg = "reactivates"
- triggerCameraAlarm()
- spawn(100)
- if(!QDELETED(src))
- cancelCameraAlarm()
if(displaymessage)
if(user)
visible_message("[user] [change_msg] [src]!")
@@ -298,14 +288,6 @@
O.reset_perspective(null)
to_chat(O, "The screen bursts into static.")
-/obj/machinery/camera/proc/triggerCameraAlarm()
- alarm_on = TRUE
- SSalarm.triggerAlarm("Camera", get_area(src), list(UID()), src)
-
-/obj/machinery/camera/proc/cancelCameraAlarm()
- alarm_on = FALSE
- SSalarm.cancelAlarm("Camera", get_area(src), src)
-
/obj/machinery/camera/proc/can_use()
if(!status)
return 0
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index a73f98778f9..2a77c5e31aa 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -51,7 +51,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
var/list/connected_robots = list()
var/aiRestorePowerRoutine = 0
//var/list/laws = list()
- alarms_listend_for = list("Motion", "Fire", "Atmosphere", "Power", "Camera", "Burglar")
+ alarms_listend_for = list("Motion", "Fire", "Atmosphere", "Power", "Burglar")
var/viewalerts = 0
var/icon/holo_icon//Default is assigned when AI is created.
var/obj/mecha/controlled_mech //For controlled_mech a mech, to determine whether to relaymove or use the AI eye.
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 4730f854391..b54847a54bd 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -13,9 +13,9 @@
var/list/stating_laws = list()// Channels laws are currently being stated on
var/list/alarms_to_show = list()
var/list/alarms_to_clear = list()
- var/list/alarm_types_show = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)
- var/list/alarm_types_clear = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)
- var/list/alarms_listend_for = list("Motion", "Fire", "Atmosphere", "Power", "Camera")
+ var/list/alarm_types_show = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0)
+ var/list/alarm_types_clear = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0)
+ var/list/alarms_listend_for = list("Motion", "Fire", "Atmosphere", "Power")
//var/list/hud_list[10]
var/list/speech_synthesizer_langs = list() //which languages can be vocalized by the speech synthesizer
var/designation = ""
@@ -106,9 +106,6 @@
if(alarm_types_show["Power"])
msg += "POWER: [alarm_types_show["Power"]] alarms detected. - "
- if(alarm_types_show["Camera"])
- msg += "CAMERA: [alarm_types_show["Camera"]] alarms detected. - "
-
msg += "\[Show Alerts\]"
var/msg_text = msg.Join("")
to_chat(src, msg_text)
@@ -132,9 +129,6 @@
if(alarm_types_clear["Power"])
msg += "POWER: [alarm_types_clear["Power"]] alarms cleared. - "
- if(alarm_types_show["Camera"])
- msg += "CAMERA: [alarm_types_clear["Camera"]] alarms cleared. - "
-
msg += "\[Show Alerts\]"
var/msg_text = msg.Join("")