diff --git a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
index b6a26fae6e28..6b2d11fd47b8 100644
--- a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
+++ b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -1283,10 +1283,10 @@
 /turf/open/floor/plating/icemoon,
 /area/overmap_encounter/planetoid/ice/explored)
 "de" = (
-/obj/machinery/rnd/production/circuit_imprinter/department,
 /obj/effect/turf_decal/corner/transparent/neutral/half{
 	dir = 1
 	},
+/obj/machinery/rnd/production/circuit_imprinter/department/engi,
 /turf/open/floor/plasteel/dark{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -1634,6 +1634,12 @@
 	},
 /turf/open/floor/plating/icemoon,
 /area/overmap_encounter/planetoid/ice/explored)
+"zv" = (
+/obj/structure/chair/plastic,
+/obj/effect/turf_decal/corner/opaque/red/diagonal,
+/obj/item/spacecash/bundle/c1000,
+/turf/open/floor/plasteel/white,
+/area/ruin)
 "zK" = (
 /obj/machinery/power/emitter{
 	dir = 1
@@ -2381,7 +2387,7 @@ QL
 QL
 QL
 QL
-eS
+zv
 aU
 bp
 Qx
diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
index 22de25b05f71..a2888e3de87c 100644
--- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
+++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -455,11 +455,11 @@
 /turf/open/floor/plasteel,
 /area/ruin/rockplanet/nanotrasen)
 "he" = (
-/obj/machinery/computer/rdconsole/experiment,
 /obj/effect/turf_decal/industrial/warning,
 /obj/structure/sign/poster/official/random{
 	pixel_y = 32
 	},
+/obj/structure/salvageable/computer,
 /turf/open/floor/plasteel/tech/grid,
 /area/ruin/rockplanet/nanotrasen)
 "ho" = (
@@ -2418,12 +2418,12 @@
 /turf/open/floor/plastic,
 /area/ruin/rockplanet/nanotrasen)
 "PH" = (
-/obj/machinery/computer/rdconsole{
-	dir = 1
-	},
 /obj/structure/sign/poster/contraband/random{
 	pixel_y = -32
 	},
+/obj/structure/salvageable/computer{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ruin/rockplanet/nanotrasen)
 "PP" = (
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/singularity_lab.dmm
index ae785ad0b213..cbde5c5aaa0a 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/singularity_lab.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/singularity_lab.dmm
@@ -11944,7 +11944,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/singularitylab/lab)
 "TL" = (
-/obj/machinery/rnd/production/circuit_imprinter/department/engi,
+/obj/structure/salvageable/circuit_imprinter,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/singularitylab/engineering)
 "TM" = (
diff --git a/_maps/_mod_celadon/configs/syndicate_elegia.json b/_maps/_mod_celadon/configs/syndicate_elegia.json
index 54898c6801ab..35bea6d58222 100644
--- a/_maps/_mod_celadon/configs/syndicate_elegia.json
+++ b/_maps/_mod_celadon/configs/syndicate_elegia.json
@@ -12,8 +12,8 @@
 	"namelists": [
 		"CYBERSUN"],
 	"job_slots": {
-		"Captain": {
-			"outfit": "/datum/outfit/job/syndicate/captain/gorlex",
+		"Cybersun research leader": {
+			"outfit": "/datum/outfit/job/syndicate/captain/cybersun",
 			"officer": true,
 			"slots": 1
 		},
@@ -21,8 +21,8 @@
 			"outfit": "/datum/outfit/job/syndicate/paramedic/cybersun",
 			"slots": 1
 		},
-		"Mechanic": {
-			"outfit": "/datum/outfit/job/syndicate/engineer/gorlex",
+		"Cybersun mechanic": {
+			"outfit": "/datum/outfit/job/syndicate/engineer/cybersun",
 			"slots": 1
 
 		},
@@ -30,12 +30,12 @@
 			"outfit": "/datum/outfit/job/syndicate/science/cybersun",
 			"slots": 2
 		},
-		"Wrecker": {
-			"outfit": "/datum/outfit/job/syndicate/miner/gorlex",
+		"Cybersun miner": {
+			"outfit": "/datum/outfit/job/syndicate/miner/cybersun",
 			"slots": 2
 		},
-		"Junior Agent": {
-			"outfit": "/datum/outfit/job/syndicate/assistant/gorlex",
+		"Cybersun assistant": {
+			"outfit": "/datum/outfit/job/syndicate/assistant/cybersun",
 			"slots": 2
 		}
 	}
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm b/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm
index 01bd9145e12f..e8341561ce3c 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm
@@ -227,13 +227,13 @@
 /area/ship/cargo)
 "ka" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
 /obj/structure/curtain/bounty,
 /obj/machinery/light_switch{
 	dir = 1;
 	pixel_x = -11;
 	pixel_y = -20
 	},
+/obj/item/bedsheet/dorms,
 /turf/open/floor/carpet,
 /area/ship/crew/dorm)
 "kf" = (
@@ -280,16 +280,12 @@
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
 /obj/structure/closet/wall/blue/directional/north,
+/obj/item/spacecash/bundle/c1000,
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "lV" = (
@@ -479,6 +475,10 @@
 /area/ship/cargo)
 "qu" = (
 /obj/structure/safe/floor,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/circuitboard/computer/rdconsole,
+/obj/item/circuitboard/machine/protolathe/department/science,
+/obj/item/circuitboard/machine/circuit_imprinter/department/science,
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "qN" = (
@@ -1210,6 +1210,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
+/obj/item/clothing/neck/stethoscope,
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "Wx" = (
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_dwayne.dmm b/_maps/_mod_celadon/shuttles/independent/independent_dwayne.dmm
index 6a194a07dbd3..24d1f158bcb0 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_dwayne.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_dwayne.dmm
@@ -57,6 +57,14 @@
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
+"aU" = (
+/obj/item/clothing/suit/hooded/explorer,
+/obj/item/clothing/suit/hooded/explorer,
+/obj/item/clothing/suit/hooded/explorer,
+/obj/structure/closet/crate/wooden,
+/obj/effect/turf_decal/corner/opaque/yellow/half,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
 "aY" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -457,11 +465,6 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "kM" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/effect/turf_decal/corner/opaque/yellow/half,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
@@ -733,6 +736,16 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"pz" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "pS" = (
@@ -1038,6 +1051,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plating/rust,
 /area/ship/cargo)
 "xr" = (
@@ -1112,9 +1128,6 @@
 /turf/open/floor/plating/airless,
 /area/ship/external)
 "zF" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /mob/living/simple_animal/turtle,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
@@ -1140,6 +1153,7 @@
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/plating,
 /area/ship/cargo)
 "zQ" = (
@@ -1321,9 +1335,14 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "GU" = (
-/obj/machinery/vending/snack/random,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
+/obj/effect/turf_decal/corner/opaque/yellow/half,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
+/obj/structure/guncloset/shotgun,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
 "GW" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/toolbox/emergency{
@@ -1417,7 +1436,7 @@
 /obj/effect/turf_decal/corner/opaque/yellow/half{
 	dir = 4
 	},
-/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "IT" = (
@@ -1481,15 +1500,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "Jg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/opaque/yellow/three_quarters{
-	dir = 4
-	},
-/obj/structure/guncloset/shotgun,
-/obj/item/gun/ballistic/shotgun/flamingarrow,
-/obj/item/gun/ballistic/shotgun/flamingarrow,
-/obj/item/gun/ballistic/shotgun/flamingarrow,
-/obj/item/gun/ballistic/shotgun/flamingarrow,
+/obj/effect/turf_decal/corner/opaque/yellow/half,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Jy" = (
@@ -1549,9 +1560,11 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "LJ" = (
-/obj/machinery/vending/cola/random,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "LK" = (
 /obj/machinery/power/solar_control{
 	dir = 8
@@ -1759,14 +1772,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/corner/opaque/yellow,
-/obj/machinery/light_switch{
-	pixel_x = 25;
-	pixel_y = -25
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Ph" = (
@@ -1934,10 +1939,11 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "RU" = (
-/obj/structure/closet/crate/wooden,
-/obj/item/clothing/suit/hooded/explorer,
-/obj/item/clothing/suit/hooded/explorer,
-/obj/item/clothing/suit/hooded/explorer,
+/obj/machinery/light_switch{
+	pixel_x = 22;
+	pixel_y = -5;
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Se" = (
@@ -2002,11 +2008,9 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "UK" = (
-/obj/machinery/light/directional/south,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
-/obj/structure/ore_box,
 /turf/open/floor/plating,
 /area/ship/cargo)
 "UP" = (
@@ -2199,6 +2203,11 @@
 "YN" = (
 /turf/closed/wall/r_wall,
 /area/ship/construction)
+"Ze" = (
+/obj/effect/turf_decal/corner/opaque/yellow/half,
+/obj/structure/ore_box,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
 "Zj" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -2559,8 +2568,8 @@ in
 Fn
 AD
 tX
-FP
-Pd
+LJ
+kM
 Jg
 uc
 or
@@ -2581,9 +2590,9 @@ in
 Ph
 FP
 nL
-Cp
+Pd
 kM
-YJ
+GU
 YJ
 IZ
 lv
@@ -2605,8 +2614,8 @@ ww
 Mo
 xh
 UK
-YJ
-LJ
+Ze
+LZ
 Sg
 lv
 tj
@@ -2625,10 +2634,10 @@ YJ
 zK
 Yp
 IK
-Cp
+pz
 RU
-YJ
-GU
+aU
+LZ
 Sg
 lv
 Fd
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm b/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm
index 180da1306fd5..2165167e6277 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm
@@ -264,8 +264,8 @@
 "eu" = (
 /obj/structure/closet/crate,
 /obj/machinery/airalarm/directional/north,
-/obj/item/circuitboard/machine/circuit_imprinter,
 /obj/effect/spawner/lootdrop/maintenance/three,
+/obj/item/circuitboard/machine/circuit_imprinter/department/science,
 /turf/open/floor/plating,
 /area/ship/construction)
 "eF" = (
@@ -3789,8 +3789,6 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "SW" = (
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm
index 542e5f3c3441..b042c26d2b4e 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm
@@ -989,7 +989,6 @@
 /obj/item/clothing/glasses/welding,
 /obj/item/clothing/head/hardhat,
 /obj/item/clothing/glasses/meson,
-/obj/item/clothing/under/syndicate/gorlex,
 /obj/item/storage/belt/utility/chief{
 	name = "\improper Foreman's toolbelt"
 	},
@@ -1572,7 +1571,6 @@
 "zZ" = (
 /obj/effect/turf_decal/industrial/outline,
 /obj/item/clothing/shoes/workboots/mining,
-/obj/item/clothing/under/syndicate/gorlex,
 /obj/item/clothing/gloves/explorer,
 /obj/item/clothing/glasses/meson,
 /obj/item/clothing/head/hardhat/orange,
@@ -1592,6 +1590,7 @@
 /obj/item/pickaxe/mini,
 /obj/item/storage/bag/ore,
 /obj/item/mining_scanner,
+/obj/item/clothing/under/syndicate/cybersun,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "Aa" = (
@@ -3069,7 +3068,6 @@
 "Yl" = (
 /obj/effect/turf_decal/industrial/outline,
 /obj/item/clothing/shoes/workboots/mining,
-/obj/item/clothing/under/syndicate/gorlex,
 /obj/item/clothing/gloves/explorer,
 /obj/item/clothing/glasses/meson,
 /obj/item/clothing/head/hardhat/orange,
@@ -3088,6 +3086,7 @@
 /obj/item/pickaxe/mini,
 /obj/item/storage/bag/ore,
 /obj/item/mining_scanner,
+/obj/item/clothing/under/syndicate/cybersun,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "Yn" = (