The Last of the Lockers (#13954)

code/game/objects/structures/crates_lockers/closets/walllocker.dm

@@ -6,9 +6,9 @@
 	desc = "A wall mounted storage locker."
 	icon = 'icons/obj/walllocker.dmi'
 	icon_state = "walllocker" //...man, how OLD is this $#!?
-	door_anim_angle = 108
-	door_anim_squish = 0.26
-	door_hinge = 9.5
+	door_anim_angle = 132
+	door_anim_squish = 0.38
+	door_hinge = -7
 	door_anim_time = 2.7
 	store_mobs = FALSE
 	density = FALSE

code/game/objects/structures/extinguisher.dm

@@ -1,16 +1,18 @@
 /obj/structure/extinguisher_cabinet
 	name = "extinguisher cabinet"
 	desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
-	icon = 'icons/obj/closet.dmi'
-	icon_state = "extinguisher_closed"
+	desc_info = "Alt-click to close the door."
+	icon = 'icons/obj/wallmounts.dmi'
+	icon_state = "cabinet"
 	anchored = 1
 	density = 0
 	var/obj/item/extinguisher/has_extinguisher
 	var/opened = 0
 
-/obj/structure/extinguisher_cabinet/New()
+/obj/structure/extinguisher_cabinet/Initialize()
 	..()
 	has_extinguisher = new/obj/item/extinguisher(src)
+	update_icon()
 
 /obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user)
 	if(isrobot(user))
@@ -35,41 +37,35 @@
 /obj/structure/extinguisher_cabinet/attack_hand(mob/user)
 	if(isrobot(user))
 		return
-	if (ishuman(user))
-		var/mob/living/carbon/human/H = user
-		var/obj/item/organ/external/temp = H.organs_by_name[BP_R_HAND]
-		if (user.hand)
-			temp = H.organs_by_name[BP_L_HAND]
-		if(temp && !temp.is_usable())
-			to_chat(user, "<span class='notice'>You try to move your [temp.name], but cannot!</span>")
-			return
+	if(use_check_and_message(usr))
+		return 0
 	if(has_extinguisher)
 		user.put_in_hands(has_extinguisher)
 		to_chat(user, "<span class='notice'>You take [has_extinguisher] from [src].</span>")
 		playsound(src.loc, 'sound/effects/extout.ogg', 50, 0)
 		has_extinguisher = null
-		opened = 1
+		opened = TRUE
 	else
 		opened = !opened
 	update_icon()
 
 /obj/structure/extinguisher_cabinet/update_icon()
-	if(!opened)
-		icon_state = "extinguisher_closed"
-		return
+	cut_overlays()
 	if(has_extinguisher)
 		if(istype(has_extinguisher, /obj/item/extinguisher/mini))
-			icon_state = "extinguisher_mini"
+			add_overlay("extinguisher_mini")
 		else
-			icon_state = "extinguisher_full"
+			add_overlay("extinguisher_full")
+	if(opened)
+		add_overlay("cabinet_door_open")
 	else
-		icon_state = "extinguisher_empty"
+		add_overlay("cabinet_door_closed")
 
 /obj/structure/extinguisher_cabinet/do_simple_ranged_interaction(var/mob/user)
 	if(has_extinguisher)
 		has_extinguisher.dropInto(loc)
 		has_extinguisher = null
-		opened = 1
+		opened = TRUE
 	else
 		opened = !opened
 	update_icon()

code/game/objects/structures/fireaxe_cabinet.dm

@@ -1,6 +1,7 @@
 /obj/structure/fireaxecabinet
 	name = "fire axe cabinet"
 	desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
+	icon = 'icons/obj/wallmounts.dmi'
 	icon_state = "fireaxe"
 	anchored = 1
 	density = 0
@@ -29,11 +30,18 @@
 /obj/structure/fireaxecabinet/update_icon()
 	cut_overlays()
 	if(fireaxe)
-		add_overlay("fireaxe_item")
+		add_overlay("axe")
 	if(shattered)
-		add_overlay("fireaxe_window_broken")
-	else if(!open)
-		add_overlay("fireaxe_window")
+		add_overlay("glass4")
+	if(unlocked)
+		add_overlay("unlocked")
+	else
+		add_overlay("locked")
+	if(open)
+		add_overlay("glass_raised")
+	else
+		add_overlay("glass")
+
 
 /obj/structure/fireaxecabinet/New()
 	..()