From bfa573f4bde0ca3542eab7493b0cacec26a44f60 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 10 Dec 2017 17:46:50 -0500 Subject: [PATCH] Update alarmlock.dm --- code/game/machinery/doors/alarmlock.dm | 74 +++++++++++--------------- 1 file changed, 32 insertions(+), 42 deletions(-) diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 76e9ca9e45..5630b3ffb0 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -1,54 +1,44 @@ -<<<<<<< HEAD -/obj/machinery/door/airlock/alarmlock - - name = "glass alarm airlock" - icon = 'icons/obj/doors/airlocks/station2/glass.dmi' - overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' - opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_glass -======= /obj/machinery/door/airlock/alarmlock name = "glass alarm airlock" icon = 'icons/obj/doors/airlocks/station2/glass.dmi' overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' opacity = 0 assemblytype = /obj/structure/door_assembly/door_assembly_public ->>>>>>> 09be3e9... Airlock Construction Update (#33152) glass = TRUE - - var/datum/radio_frequency/air_connection - var/air_frequency = 1437 + + var/datum/radio_frequency/air_connection + var/air_frequency = 1437 autoclose = FALSE - -/obj/machinery/door/airlock/alarmlock/New() - ..() - air_connection = new - -/obj/machinery/door/airlock/alarmlock/Destroy() + +/obj/machinery/door/airlock/alarmlock/New() + ..() + air_connection = new + +/obj/machinery/door/airlock/alarmlock/Destroy() SSradio.remove_object(src,air_frequency) - air_connection = null - return ..() - -/obj/machinery/door/airlock/alarmlock/Initialize() + air_connection = null + return ..() + +/obj/machinery/door/airlock/alarmlock/Initialize() . = ..() - SSradio.remove_object(src, air_frequency) - air_connection = SSradio.add_object(src, air_frequency, GLOB.RADIO_TO_AIRALARM) - open() - -/obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal) - ..() - if(stat & (NOPOWER|BROKEN)) - return - - var/alarm_area = signal.data["zone"] - var/alert = signal.data["alert"] - - var/area/our_area = get_area(src) - if(alarm_area == our_area.name) - switch(alert) - if("severe") + SSradio.remove_object(src, air_frequency) + air_connection = SSradio.add_object(src, air_frequency, GLOB.RADIO_TO_AIRALARM) + open() + +/obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal) + ..() + if(stat & (NOPOWER|BROKEN)) + return + + var/alarm_area = signal.data["zone"] + var/alert = signal.data["alert"] + + var/area/our_area = get_area(src) + if(alarm_area == our_area.name) + switch(alert) + if("severe") autoclose = TRUE - close() - if("minor", "clear") + close() + if("minor", "clear") autoclose = FALSE - open() \ No newline at end of file + open()