diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm
index 676301c8271e..a537ef01dd27 100644
--- a/_maps/shuttles/independent/independent_mudskipper.dmm
+++ b/_maps/shuttles/independent/independent_mudskipper.dmm
@@ -324,13 +324,14 @@
 /obj/item/circular_saw,
 /obj/item/multitool,
 /obj/item/stack/marker_beacon/thirty,
-/obj/item/gun/energy/plasmacutter,
 /obj/structure/cable{
 	icon_state = "2-10"
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/item/radio/headset/alt,
+/obj/item/gear_pack/anglegrinder,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo)
 "gT" = (
diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
index 78053b7e5e8c..d4373e7920fb 100644
--- a/_maps/shuttles/independent/independent_rigger.dmm
+++ b/_maps/shuttles/independent/independent_rigger.dmm
@@ -4468,7 +4468,8 @@
 /obj/item/storage/toolbox/mechanical,
 /obj/item/storage/belt/utility,
 /obj/item/clothing/glasses/welding,
-/obj/item/gun/energy/plasmacutter,
+/obj/item/gear_pack/anglegrinder,
+/obj/item/radio/headset/alt,
 /turf/open/floor/plating,
 /area/ship/engineering)
 
diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
index 8cdb3dfae61a..50811d64208a 100644
--- a/_maps/shuttles/independent/independent_shetland.dmm
+++ b/_maps/shuttles/independent/independent_shetland.dmm
@@ -4852,8 +4852,10 @@
 /obj/item/multitool,
 /obj/item/clothing/glasses/welding,
 /obj/item/clothing/glasses/welding,
-/obj/item/gun/energy/plasmacutter,
-/obj/item/gun/energy/plasmacutter,
+/obj/item/radio/headset/alt,
+/obj/item/radio/headset/alt,
+/obj/item/gear_pack/anglegrinder,
+/obj/item/gear_pack/anglegrinder,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/electrical)
 "OU" = (
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index 44715cfbfead..a8a0d61a43b2 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -686,7 +686,8 @@
 	req_access_txt = "11";
 	req_one_access = null
 	},
-/obj/item/gun/energy/plasmacutter,
+/obj/item/gear_pack/anglegrinder,
+/obj/item/radio/headset/alt,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "eu" = (
@@ -4900,7 +4901,8 @@
 	pixel_x = 20;
 	pixel_y = 11
 	},
-/obj/item/gun/energy/plasmacutter,
+/obj/item/gear_pack/anglegrinder,
+/obj/item/radio/headset/alt,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "Fe" = (
@@ -6279,7 +6281,8 @@
 	req_access_txt = "11";
 	req_one_access = null
 	},
-/obj/item/gun/energy/plasmacutter,
+/obj/item/gear_pack/anglegrinder,
+/obj/item/radio/headset/alt,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "OK" = (
@@ -7827,7 +7830,8 @@
 	name = "honorable artificer's toolbelt"
 	},
 /obj/machinery/airalarm/directional/west,
-/obj/item/gun/energy/plasmacutter,
+/obj/item/gear_pack/anglegrinder/energy,
+/obj/item/radio/headset/alt,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "ZB" = (
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
index 5d181bcf584c..aaab924de1dc 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -2097,12 +2097,13 @@
 	dir = 4
 	},
 /obj/structure/closet/secure_closet/lp/engineer,
-/obj/item/gun/energy/plasmacutter,
 /obj/machinery/light_switch{
 	dir = 8;
 	pixel_x = 19;
 	pixel_y = -10
 	},
+/obj/item/radio/headset/alt,
+/obj/item/gear_pack/anglegrinder,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/engineering)
 "pA" = (
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 6b63e3626a88..4b4f9f217cde 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -3808,8 +3808,9 @@
 	},
 /obj/item/clothing/under/syndicate/hardliners,
 /obj/item/clothing/suit/hazardvest/hardliners,
-/obj/item/gun/energy/plasmacutter,
 /obj/item/clothing/gloves/color/red/insulated,
+/obj/item/gear_pack/anglegrinder,
+/obj/item/radio/headset/alt,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "KL" = (