From b9ee2edb60c2b30dfa80825d627086be83187c81 Mon Sep 17 00:00:00 2001 From: datlo Date: Sun, 2 Dec 2018 06:31:29 +0000 Subject: [PATCH 1/3] add power requirement to burglar alarm --- code/game/objects/structures/displaycase.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 3b174480ce8..ff3123944e1 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -184,7 +184,9 @@ var/global/list/captain_display_cases = list() playsound(get_turf(src), "shatter", 70, 1) update_icon() spawn(0) - burglar_alarm() + var/area/a = get_area(src) + if(isarea(a) && a.power_equip) + burglar_alarm() else playsound(get_turf(src), 'sound/effects/Glasshit.ogg', 75, 1) return From 30dc181e60d3dcf4a7e145368c0edd0a765b32d3 Mon Sep 17 00:00:00 2001 From: datlo Date: Mon, 3 Dec 2018 21:16:37 +0000 Subject: [PATCH 2/3] added var for power need --- code/game/objects/structures/displaycase.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index ff3123944e1..91b3fcd8a3e 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -107,6 +107,7 @@ var/global/list/captain_display_cases = list() var/image/occupant_overlay = null var/obj/item/airlock_electronics/circuit var/start_showpiece_type = null //add type for items on display + var/alarm_needs_power = TRUE /obj/structure/displaycase/New() . = ..() @@ -184,9 +185,12 @@ var/global/list/captain_display_cases = list() playsound(get_turf(src), "shatter", 70, 1) update_icon() spawn(0) - var/area/a = get_area(src) - if(isarea(a) && a.power_equip) + if (!alarm_needs_power) burglar_alarm() + else + var/area/a = get_area(src) + if(isarea(a) && a.power_equip) + burglar_alarm() else playsound(get_turf(src), 'sound/effects/Glasshit.ogg', 75, 1) return From 2d60c69f2f2e81667b72f01654468909b44b0614 Mon Sep 17 00:00:00 2001 From: datlo Date: Tue, 11 Dec 2018 13:02:55 +0000 Subject: [PATCH 3/3] spacing --- code/game/objects/structures/displaycase.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 91b3fcd8a3e..25be04aaffd 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -185,7 +185,7 @@ var/global/list/captain_display_cases = list() playsound(get_turf(src), "shatter", 70, 1) update_icon() spawn(0) - if (!alarm_needs_power) + if(!alarm_needs_power) burglar_alarm() else var/area/a = get_area(src)