From 415d63226118dddffb44d352347752265a8f1ece Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sat, 21 Jul 2018 23:10:22 -0700
Subject: [PATCH] Merge pull request #5427 from Anewbe/fireaxe_cabinet

Fixes the fireaxe cabinet
---
 .../objects/structures/crates_lockers/closets/fireaxe.dm     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
index 96b0030d21..fd893458ae 100644
--- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
@@ -16,6 +16,10 @@
 
 	starts_with = list(/obj/item/weapon/material/twohanded/fireaxe)
 
+/obj/structure/closet/fireaxecabinet/New()
+	..()
+	fireaxe = locate() in contents
+
 /obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
 	//..() //That's very useful, Erro
 
@@ -115,6 +119,7 @@
 	if(src.locked)
 		to_chat(user, "<span class='warning'>The cabinet won't budge!</span>")
 		return
+
 	if(localopened)
 		if(fireaxe)
 			user.put_in_hands(fireaxe)