From e94fc84ca6cef3337dfeacadc9e1aa17110a43dc Mon Sep 17 00:00:00 2001 From: Spacemanspark Date: Fri, 11 Dec 2015 14:38:57 -0600 Subject: [PATCH] Fixes wall lockers. HOORAH. --- .../structures/crates_lockers/walllocker.dm | 8 +++++++- icons/obj/walllocker.dmi | Bin 2795 -> 1710 bytes 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index 2937e7b58ac..03a81a7ca5b 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -11,6 +11,10 @@ icon_closed = "wall-locker" icon_opened = "wall-lockeropen" +/obj/structure/closet/walllocker/close() + ..() + density = 0 //It's a locker in a wall, you aren't going to be walking into it. + //spawns endless (3 sets) amounts of breathmask, emergency oxy tank and crowbar /obj/structure/closet/walllocker/emerglocker @@ -19,12 +23,14 @@ var/list/spawnitems = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/weapon/crowbar) var/amount = 3 // spawns each items X times. icon_state = "emerg" + icon_closed = "emerg" + icon_opened = "emergopen" /obj/structure/closet/walllocker/emerglocker/attack_hand(mob/user as mob) if (istype(user, /mob/living/silicon/ai)) //Added by Strumpetplaya - AI shouldn't be able to return //activate emergency lockers. This fixes that. (Does this make sense, the AI can't call attack_hand, can it? --Mloc) if(!amount) - usr << "It's empty.." + usr << "It's empty." return if(amount) usr << "You take out some items from \the [src]." diff --git a/icons/obj/walllocker.dmi b/icons/obj/walllocker.dmi index 1b3fe851f0d8ad3681f5c210ec81e1faaebe1e31..4c9389ec1aa5523c7cea52e0f20ef9e8d0fba152 100644 GIT binary patch delta 1561 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 raYBUDA19vrOT7QVKGa#Sfu*9g>XUPT6+QeGf