From 2908f321be76a17c3a3ec6a6b6ad8c627dcf44c0 Mon Sep 17 00:00:00 2001 From: Luc <89928798+lewcc@users.noreply.github.com> Date: Sat, 9 Oct 2021 11:47:52 -0400 Subject: [PATCH] Fix fireaxe cabinet not dropping the axe when destroyed (#16880) * Move fireaxe item init later, make sure destroy properly forcemoves it too * Normal locker code can clean up after itself * Remove extra space, oops * remove parent call Co-authored-by: Farie82 Co-authored-by: Farie82 --- .../objects/structures/crates_lockers/closets/fireaxe.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 4eda067ca51..d8a2cb5b04b 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -2,7 +2,7 @@ /obj/structure/closet/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." - var/obj/item/twohanded/fireaxe/fireaxe = new/obj/item/twohanded/fireaxe + var/obj/item/twohanded/fireaxe/fireaxe icon_state = "fireaxe1000" icon_closed = "fireaxe1000" icon_opened = "fireaxe1100" @@ -15,6 +15,10 @@ locked = TRUE var/smashed = FALSE +/obj/structure/closet/fireaxecabinet/populate_contents() + fireaxe = new/obj/item/twohanded/fireaxe(src) + update_icon() // So its initial icon doesn't show it without the fireaxe + /obj/structure/closet/fireaxecabinet/examine(mob/user) . = ..() . += "Use a multitool to lock/unlock it."