diff --git a/_maps/shuttles/independent/solgov_inkwell.dmm b/_maps/shuttles/independent/solgov_inkwell.dmm
index 42cffd4adb23..2052a91d6711 100644
--- a/_maps/shuttles/independent/solgov_inkwell.dmm
+++ b/_maps/shuttles/independent/solgov_inkwell.dmm
@@ -1481,13 +1481,10 @@
 /turf/open/floor/carpet/blue,
 /area/ship/crew/canteen/kitchen)
 "ka" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/solgov,
 /obj/effect/turf_decal/techfloor{
 	dir = 9
 	},
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/tank/internals/oxygen/yellow,
+/obj/machinery/suit_storage_unit/solgov,
 /turf/open/floor/plasteel/white,
 /area/ship/security/armory)
 "ke" = (
@@ -4992,14 +4989,12 @@
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/effect/turf_decal/trimline/opaque/solgovblue/warning{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /turf/open/floor/plasteel/white,
 /area/ship/security/armory)
 "Gn" = (
@@ -5053,8 +5048,6 @@
 /turf/open/floor/wood,
 /area/ship/crew/library)
 "GD" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/solgov,
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
@@ -5062,8 +5055,7 @@
 /obj/effect/turf_decal/corner/opaque/solgovblue{
 	dir = 10
 	},
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/tank/internals/oxygen/yellow,
+/obj/machinery/suit_storage_unit/solgov,
 /turf/open/floor/plasteel/white,
 /area/ship/security/armory)
 "GF" = (
@@ -5835,6 +5827,9 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/security/armory)
 "LZ" = (
@@ -6360,14 +6355,11 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "QA" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/solgov,
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/tank/internals/oxygen/yellow,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/suit_storage_unit/solgov,
 /turf/open/floor/plasteel/white,
 /area/ship/security/armory)
 "QB" = (