From baed39c2633eb9d910b7267959f21cf5b9e60c3a Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Mon, 9 Mar 2015 20:55:05 +0100 Subject: [PATCH] Attempts to fix persistent station alarms. Makes wardrobes solid. --- code/game/area/areas.dm | 10 +++++----- code/game/objects/structures/under_wardrobe.dm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index ae11b5aa487..0778f50174a 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -38,6 +38,11 @@ return cameras /area/proc/atmosalert(danger_level, var/alarm_source) + if (danger_level == 0) + atmosphere_alarm.clearAlarm(master, alarm_source) + else + atmosphere_alarm.triggerAlarm(master, alarm_source, severity = danger_level) + //Check all the alarms before lowering atmosalm. Raising is perfectly fine. for (var/area/RA in related) for (var/obj/machinery/alarm/AA in RA) @@ -51,11 +56,6 @@ else if (danger_level >= 2 && atmosalm < 2) air_doors_close() - if (danger_level == 0) - atmosphere_alarm.clearAlarm(master, alarm_source) - else - atmosphere_alarm.triggerAlarm(master, alarm_source, severity = danger_level) - atmosalm = danger_level for(var/area/RA in related) for (var/obj/machinery/alarm/AA in RA) diff --git a/code/game/objects/structures/under_wardrobe.dm b/code/game/objects/structures/under_wardrobe.dm index fbb9470aa69..d0538494967 100644 --- a/code/game/objects/structures/under_wardrobe.dm +++ b/code/game/objects/structures/under_wardrobe.dm @@ -3,7 +3,7 @@ desc = "Holds item of clothing you shouldn't be showing off in the hallways." icon = 'icons/obj/closet.dmi' icon_state = "cabinet_closed" - + density = 1 /obj/structure/undies_wardrobe/attack_hand(mob/user as mob) src.add_fingerprint(user)