From 8faa8c5c9ce1086797ba84535546045b111e1648 Mon Sep 17 00:00:00 2001 From: Neerti Date: Fri, 27 Jul 2018 02:15:57 -0400 Subject: [PATCH] Fireaxe cabinets find their fireaxes in initialize(), rather than new() --- .../objects/structures/crates_lockers/closets/fireaxe.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 96b0030d21e..d2219cb8a79 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -16,6 +16,13 @@ starts_with = list(/obj/item/weapon/material/twohanded/fireaxe) +<<<<<<< HEAD +======= +/obj/structure/closet/fireaxecabinet/initialize() + ..() + fireaxe = locate() in contents + +>>>>>>> 8cd1f6a... Merge pull request #5446 from Anewbe/fireaxe_fix_again /obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri //..() //That's very useful, Erro