Buffs Firelockers + Adds New Tool: The Rescue Axe (#14006)

code/game/objects/items/weapons/tools.dm

@@ -737,6 +737,38 @@
 	icon_state = "crowbar_red"
 	item_state = "crowbar_red"
 
+/obj/item/crowbar/rescue_axe //Imagine something like a crash axe found on airplanes or forcing tools used by emergency services. This is a tool first and foremost.
+	name = "rescue axe"
+	desc = "A short lightweight emergency tool meant to chop, pry and pierce. Most of the handle is insulated excepting the wedge at the very bottom. The axe head atop the tool has a short pick opposite of the blade."
+	icon_state = "rescue_axe"
+	item_state = "rescue_axe"
+	w_class = ITEMSIZE_NORMAL
+	force = 12
+	throwforce = 12
+	flags = null //Handle is insulated, so this means it won't conduct electricity and hurt you.
+	sharp = TRUE
+	edge = TRUE
+	origin_tech = list(TECH_ENGINEERING = 2)
+
+/obj/item/crowbar/rescue_axe/resolve_attackby(atom/A)//In practice this means it just does full damage to reinforced windows, which halve the force of attacks done against it already. That's just fine.
+	if(istype(A, /obj/structure/window))
+		force = initial(force) * 2
+	else
+		force = initial(force)
+	. = ..()
+
+/obj/item/crowbar/rescue_axe/iscrowbar()//go ham
+	if(ismob(loc))
+		var/mob/M = loc
+		if(M.a_intent && M.a_intent == I_HURT)
+			return FALSE
+
+	return TRUE
+
+/obj/item/crowbar/rescue_axe/red 
+	icon_state = "rescue_axe_red"
+	item_state = "rescue_axe_red"
+	
 // Pipe wrench
 /obj/item/pipewrench
 	name = "pipe wrench"

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -23,7 +23,7 @@
 	new /obj/item/device/megaphone/engi(src)
 	new /obj/item/storage/toolbox/mechanical(src)
 	new /obj/item/clothing/suit/storage/hazardvest/ce(src)
-	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas/alt(src)
 	new /obj/item/clothing/mask/gas/half(src)
 	new /obj/item/device/multitool(src)
 	new /obj/item/device/flash(src)
@@ -102,7 +102,7 @@
 	new /obj/item/device/radio/headset/headset_eng(src)
 	new /obj/item/device/radio/headset/headset_eng/alt(src)
 	new /obj/item/clothing/suit/storage/hazardvest(src)
-	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas/alt(src)
 	new /obj/item/clothing/mask/gas/half(src)
 	new /obj/item/taperoll/engineering(src)
 	new /obj/item/clothing/accessory/storage/overalls/engineer(src)
@@ -126,7 +126,7 @@
 	new /obj/item/device/radio/headset/headset_eng(src)
 	new /obj/item/device/radio/headset/headset_eng/alt(src)
 	new /obj/item/clothing/suit/storage/hazardvest/blue/atmos(src)
-	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas/alt(src)
 	new /obj/item/clothing/mask/gas/half(src)
 	new /obj/item/taperoll/engineering(src)
 	new /obj/item/clothing/accessory/storage/overalls/engineer(src)

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

@@ -104,20 +104,23 @@
 /obj/structure/closet/firecloset/fill()
 	new /obj/item/clothing/head/hardhat/firefighter(src)
 	new /obj/item/clothing/suit/fire(src)
-	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas/alt(src)
+	new /obj/item/crowbar/rescue_axe/red(src)
 	new /obj/item/tank/oxygen/red(src)
 	new /obj/item/extinguisher(src)
+	new /obj/item/inflatable/door(src)
+	new /obj/item/inflatable/wall(src)
+	new /obj/item/inflatable/wall(src)
 
 /obj/structure/closet/firecloset/full/fill()
 	new /obj/item/clothing/head/hardhat/firefighter(src)
 	new /obj/item/clothing/suit/fire(src)
-	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas/alt(src)
+	new /obj/item/crowbar/rescue_axe/red(src)
 	new /obj/item/device/flashlight(src)
 	new /obj/item/tank/oxygen/red(src)
 	new /obj/item/extinguisher(src)
-
-
-
+	new /obj/item/storage/bag/inflatable/emergency(src)
 
 /*
  * Tool Closet

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

@@ -53,14 +53,28 @@
 /obj/structure/closet/walllocker/firecloset/fill()
 	new /obj/item/clothing/head/hardhat/firefighter(src)
 	new /obj/item/clothing/suit/fire(src)
-	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas/alt(src)
 	new /obj/item/device/flashlight(src)
+	new /obj/item/crowbar/rescue_axe/red(src)
 	new /obj/item/tank/oxygen/red(src)
 	new /obj/item/extinguisher(src)
+	new /obj/item/inflatable/door(src)
+	new /obj/item/inflatable/wall(src)
+	new /obj/item/inflatable/wall(src)
 
 	if (prob(25))
 		new /obj/item/ladder_mobile(src)
 
+/obj/structure/closet/walllocker/firecloset/medical/fill()
+	new /obj/item/clothing/head/hardhat/firefighter(src)
+	new /obj/item/clothing/suit/fire(src)
+	new /obj/item/clothing/mask/gas/alt(src)
+	new /obj/item/device/flashlight(src)
+	new /obj/item/tank/oxygen/red(src)
+	new /obj/item/extinguisher(src)
+	new /obj/item/ladder_mobile(src)
+	new /obj/item/storage/bag/inflatable/emergency(src)
+
 /obj/structure/closet/walllocker/medical //wall mounted medical closet
 	name = "first-aid closet"
 	desc = "It's wall-mounted storage unit for first aid supplies."

code/game/objects/structures/inflatable.dm

@@ -289,6 +289,8 @@
 	pickup_sound = 'sound/items/pickup/backpack.ogg'
 
 /obj/item/storage/bag/inflatable/emergency
+	name = "emergency inflatable barrier box"
+	desc = "Contains inflatable walls and doors. This box has emergency labelling on it and outlines that there's only enough inflatables within to secure a small area."
 	starts_with = list(/obj/item/inflatable/door = 2, /obj/item/inflatable/wall = 3)
 
 #undef STATE_CLOSED