Merge pull request #10394 from datlo/burglaralarmfix

Add power requirement to burglar alarm trigger
This commit is contained in:
variableundefined
2018-12-11 21:21:03 +08:00
committed by GitHub
+7 -1
View File
@@ -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,7 +185,12 @@ var/global/list/captain_display_cases = list()
playsound(get_turf(src), "shatter", 70, 1)
update_icon()
spawn(0)
burglar_alarm()
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