diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm
index 231f4fb97b2..1de4b9d83ee 100644
--- a/maps/tgstation.2.0.9.dmm
+++ b/maps/tgstation.2.0.9.dmm
@@ -1323,7 +1323,7 @@
 "azw" = (/obj/structure/windoor_assembly{dir = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor,/area/teleporter/gateway)
 "azx" = (/obj/item/stack/sheet/rglass{amount = 2},/obj/item/weapon/screwdriver{pixel_y = 16},/obj/structure/window/reinforced,/turf/simulated/floor,/area/teleporter/gateway)
 "azy" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/window/reinforced,/turf/simulated/floor,/area/teleporter/gateway)
-"azz" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/fpmaint)
+"azz" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/mask/gas,/obj/item/clothing/head/hardhat/red,/turf/simulated/floor/plating,/area/maintenance/fpmaint)
 "azA" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/ai_monitored/storage/eva)
 "azB" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/ai_monitored/storage/eva)
 "azC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/ai_monitored/storage/eva)
@@ -3081,7 +3081,7 @@
 "bhm" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/storage/emergency)
 "bhn" = (/obj/item/weapon/extinguisher,/turf/simulated/floor/plating,/area/storage/emergency)
 "bho" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/storage/emergency)
-"bhp" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/extinguisher,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint)
+"bhp" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/extinguisher,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/clothing/head/hardhat/red,/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "bhq" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 0},/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bhr" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/white,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bhs" = (/obj/item/weapon/pen,/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
@@ -5812,7 +5812,7 @@
 "chN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engine/engineering)
 "chO" = (/obj/machinery/camera{c_tag = "Engineering East"; dir = 1; pixel_x = 23},/obj/effect/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = -32},/obj/machinery/light,/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engine/engineering)
 "chP" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/mask/gas{pixel_x = 3; pixel_y = 3},/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas{pixel_x = -3; pixel_y = -3},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engine/engineering)
-"chQ" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/head/hardhat,/obj/item/clothing/head/hardhat,/obj/effect/sign/pods{pixel_x = 32; pixel_y = 0},/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/engine/engineering)
+"chQ" = (/obj/effect/sign/pods{pixel_x = 32; pixel_y = 0},/obj/structure/closet/firecloset,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/engine/engineering)
 "chR" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst{dir = 4},/turf/simulated/shuttle/wall{tag = "icon-swall_f5"; icon_state = "swall_f5"; dir = 2},/area/shuttle/escape_pod5/station)
 "chS" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s9"; icon_state = "swall_s9"; dir = 2},/area/shuttle/escape_pod5/station)
 "chT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/engine/engineering)