MERGE SHIT REEEEE IMMAH PUNCH A WALL

This commit is contained in:
datlo
2018-12-18 11:47:29 +00:00
135 changed files with 1985 additions and 761 deletions
+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()
. = ..()
@@ -191,7 +192,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