diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm
index aea05a73c14..0ec4671e922 100644
--- a/code/defines/area/Space Station 13 areas.dm	
+++ b/code/defines/area/Space Station 13 areas.dm	
@@ -482,11 +482,11 @@ proc/process_teleport_locs()
 	icon_state = "courtroom"
 
 /area/crew_quarters/heads
-	name = "Head of Staff's Quarters"
+	name = "Head of Personnel's Quarters"
 	icon_state = "head_quarters"
 
 /area/crew_quarters/hor
-	name = "Head of Research's Office"
+	name = "Research Director's Office"
 	icon_state = "head_quarters"
 
 /area/crew_quarters/chief
diff --git a/code/game/objects/closets/firecloset.dm b/code/game/objects/closets/firecloset.dm
index 6d60511f120..02eed7cfcf6 100644
--- a/code/game/objects/closets/firecloset.dm
+++ b/code/game/objects/closets/firecloset.dm
@@ -1,21 +1,14 @@
 /obj/closet/firecloset/New()
 	..()
-
+	sleep(2)
 	if (prob (1))
 		del(src)
 		return
 
-	switch (pickweight(list("extinguisher" = 40, "toolbox" = 40, "nothing" = 20)))
-		if ("extinguisher")
-			new /obj/item/weapon/extinguisher(src)
-		if ("toolbox")
-			new /obj/item/weapon/storage/toolbox/emergency(src)
+	new /obj/item/weapon/extinguisher(src)
 
-	if (prob (30))
-		new /obj/item/clothing/mask/breath(src)
+	new /obj/item/clothing/mask/gas(src)
 
-	if (prob (30))
-		new /obj/item/weapon/tank/emergency_oxygen(src)
+	new /obj/item/weapon/tank/emergency_oxygen(src)
 
-	if (prob (10))
-		new /obj/item/clothing/suit/fire/firefighter(src)
\ No newline at end of file
+	new /obj/item/clothing/suit/fire/firefighter(src)
\ No newline at end of file
diff --git a/maps/tgstation.2.0.0.dmm b/maps/tgstation.2.0.0.dmm
index d987a0c30e9..8e96b017577 100644
--- a/maps/tgstation.2.0.0.dmm
+++ b/maps/tgstation.2.0.0.dmm
@@ -4064,7 +4064,7 @@
 "bAh" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/turf/simulated/wall/r_wall,/area/atmos)
 "bAi" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/obj/machinery/meter,/turf/simulated/floor,/area/atmos)
 "bAj" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/obj/machinery/meter,/turf/simulated/floor,/area/atmos)
-"bAk" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 4; icon_state = "intact-c"; layer = 3; level = 2},/obj/item/weapon/extinguisher,/obj/item/weapon/extinguisher,/turf/simulated/floor,/area/atmos)
+"bAk" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 4; icon_state = "intact-c"; layer = 3; level = 2},/obj/reagent_dispensers/watertank,/turf/simulated/floor,/area/atmos)
 "bAl" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 4; icon_state = "intact-c"; layer = 3; level = 2},/turf/simulated/wall,/area/atmos)
 "bAm" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 4; icon_state = "intact-c"; layer = 3; level = 2},/turf/simulated/wall,/area/atmos)
 "bAn" = (/obj/machinery/light{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/valve/digital{color = "cyan"; dir = 4; icon_state = "valve1"; name = "Mixed Air Connectors"; open = 1},/turf/simulated/floor,/area/atmos)
@@ -4095,7 +4095,7 @@
 "bAM" = (/obj/machinery/light{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/turf/simulated/floor,/area/atmos)
 "bAN" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/turf/simulated/floor,/area/atmos)
 "bAO" = (/obj/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor,/area/atmos)
-"bAP" = (/obj/rack{dir = 4},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/extinguisher,/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/gas,/turf/simulated/floor,/area/atmos)
+"bAP" = (/obj/closet/firecloset,/turf/simulated/floor,/area/atmos)
 "bAQ" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 5; icon_state = "intact-g"; layer = 3; level = 2},/turf/simulated/wall,/area/atmos)
 "bAR" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 4; icon_state = "intact-g"; layer = 3; level = 2},/obj/machinery/pipedispenser/disposal,/turf/simulated/floor,/area/atmos)
 "bAS" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; icon_state = "intact-c"; level = 2},/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 4; icon_state = "intact-g"; layer = 3; level = 2},/turf/simulated/floor,/area/atmos)
@@ -4132,7 +4132,7 @@
 "bBx" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/atmos)
 "bBy" = (/obj/machinery/access_button{command = "cycle_interior"; master_tag = "atmos_access_console"; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/turf/simulated/floor,/area/atmos)
 "bBz" = (/obj/item/device/radio/beacon,/turf/simulated/floor,/area/atmos)
-"bBA" = (/obj/rack{dir = 4},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/extinguisher,/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/gas,/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/atmos)
+"bBA" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/closet/firecloset,/turf/simulated/floor,/area/atmos)
 "bBB" = (/obj/machinery/light{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/obj/closet/wardrobe/atmospherics_yellow,/turf/simulated/floor,/area/atmos)
 "bBC" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; icon_state = "intact-c"; level = 2},/turf/simulated/floor,/area/atmos)
 "bBD" = (/obj/machinery/atmospherics/valve/digital{color = "green"; dir = 4; name = "Plasma Intake Valve"},/turf/simulated/floor,/area/atmos)
diff --git a/tgstation.dme b/tgstation.dme
index 7635965de60..38d9a46850f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -474,6 +474,7 @@
 #include "code\game\objects\alien\resin.dm"
 #include "code\game\objects\alien\weeds.dm"
 #include "code\game\objects\closets\emergency.dm"
+#include "code\game\objects\closets\firecloset.dm"
 #include "code\game\objects\closets\gimmick.dm"
 #include "code\game\objects\closets\gmcloset.dm"
 #include "code\game\objects\closets\janitor.dm"