diff --git a/_maps/_mod_celadon/configs/elysium_aldaama.json b/_maps/_mod_celadon/configs/elysium_aldaama.json
index de6ecb2f39d0..6e24bd324188 100644
--- a/_maps/_mod_celadon/configs/elysium_aldaama.json
+++ b/_maps/_mod_celadon/configs/elysium_aldaama.json
@@ -19,16 +19,16 @@
 	"limit": 1,
 	"job_slots": {
 		"Caid": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"officer": true,
 			"slots": 1
 		},
 		"Ahisa`i": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots": 3
 		},
 		"Mukatell": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots" : 2
 		}
 	},
diff --git a/_maps/_mod_celadon/configs/elysium_homa.json b/_maps/_mod_celadon/configs/elysium_homa.json
index dad6a50160cc..82f9d07fde92 100644
--- a/_maps/_mod_celadon/configs/elysium_homa.json
+++ b/_maps/_mod_celadon/configs/elysium_homa.json
@@ -17,20 +17,20 @@
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"officer": true,
 			"slots": 1
 		},
 		"Ship Engineer-Miner": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots": 2
 		},
 		"Ship's Doctor": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots": 1
 		},
 		"Scribe": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots" : 2
 		}
 	},
diff --git a/_maps/_mod_celadon/configs/elysium_iron_maiden.json b/_maps/_mod_celadon/configs/elysium_iron_maiden.json
index 88104705cf81..e877dcb40230 100644
--- a/_maps/_mod_celadon/configs/elysium_iron_maiden.json
+++ b/_maps/_mod_celadon/configs/elysium_iron_maiden.json
@@ -17,16 +17,16 @@
 	"limit": 1,
 	"job_slots": {
 		"Caid": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"officer": true,
 			"slots": 1
 		},
 		"Ahisa`i": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots": 3
 		},
 		"Mukatell": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots": 2
 		}
 		},
diff --git a/_maps/_mod_celadon/configs/elysium_kondor.json b/_maps/_mod_celadon/configs/elysium_kondor.json
index 0e76bb921894..28d5b5d08769 100644
--- a/_maps/_mod_celadon/configs/elysium_kondor.json
+++ b/_maps/_mod_celadon/configs/elysium_kondor.json
@@ -16,16 +16,16 @@
 "limit": 2,
 "job_slots": {
 	"Каид": {
-		"outfit": "/datum/outfit/job/independent/assistant",
+		"outfit": "/datum/outfit/job/elysium/assistant",
 		"officer": true,
 		"slots": 1
 	},
 	"Ахиса'и": {
-		"outfit": "/datum/outfit/job/independent/assistant",
+		"outfit": "/datum/outfit/job/elysium/assistant",
 		"slots": 1
 	},
 	"Мукатэлл": {
-		"outfit": "/datum/outfit/job/independent/assistant",
+		"outfit": "/datum/outfit/job/elysium/assistant",
 		"slots" : 2
 	}
 },
diff --git a/_maps/_mod_celadon/outpost/indie_space.dmm b/_maps/_mod_celadon/outpost/indie_space.dmm
index 3bd4cf28c334..74dbb2ddacf6 100644
--- a/_maps/_mod_celadon/outpost/indie_space.dmm
+++ b/_maps/_mod_celadon/outpost/indie_space.dmm
@@ -1080,9 +1080,6 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable/yellow,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/camera/autoname{
-	dir = 10
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/effect/turf_decal/corner/opaque/black{
 	dir = 5
@@ -3885,6 +3882,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/camera/autoname{
+	dir = 10
+	},
 /turf/open/floor/plasteel/tech,
 /area/outpost/hallway/port)
 "yk" = (
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm
index b03789d07b5b..ae085a665e6d 100644
--- a/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm
+++ b/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm
@@ -909,10 +909,10 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "ys" = (
-/obj/item/circuitboard/computer/cargo/express,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/item/circuitboard/computer/cargo,
 /turf/open/floor/carpet/green,
 /area/ship/bridge)
 "yE" = (
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
index fb3928096488..94b651afaa60 100644
--- a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
+++ b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
@@ -367,7 +367,6 @@
 /obj/structure/frame/computer{
 	dir = 8
 	},
-/obj/item/circuitboard/computer/cargo/express,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "oZ" = (
@@ -599,6 +598,7 @@
 	dir = 9
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/item/circuitboard/computer/cargo,
 /turf/open/floor/plating,
 /area/ship/bridge)
 "wb" = (
@@ -619,7 +619,8 @@
 /obj/structure/fluff/clockwork/alloy_shards,
 /obj/effect/decal/cleanable/dirt/dust,
 /mob/living/simple_animal/hostile/retaliate/goose{
-	name = "Khasir"
+	name = "Khasir";
+	faction = list("playerElysium")
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
@@ -757,7 +758,9 @@
 "yX" = (
 /obj/structure/catwalk,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/porta_turret,
+/obj/machinery/porta_turret{
+	faction = list("playerElysium","turret")
+	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "zc" = (
@@ -1107,7 +1110,9 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "MP" = (
-/obj/machinery/porta_turret,
+/obj/machinery/porta_turret{
+	faction = list("playerElysium","turret")
+	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "MV" = (
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
index 94d6c4086a64..224d4bf679ec 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
@@ -1433,7 +1433,7 @@
 "qJ" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 9;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -2136,7 +2136,7 @@
 "xh" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 5;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -3003,7 +3003,7 @@
 "Hu" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 6;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3282,7 +3282,7 @@
 "Ll" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 5;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3531,7 +3531,7 @@
 "Oa" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 6;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -3817,7 +3817,7 @@
 "QZ" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 10;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
index b913bf33b0c4..5938b19f0c82 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
@@ -305,7 +305,7 @@
 "cM" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 5;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -464,7 +464,7 @@
 "ej" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 6;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
index 9a53a548683a..8e98a05b4062 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
@@ -700,7 +700,9 @@
 "yX" = (
 /obj/structure/catwalk,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/porta_turret,
+/obj/machinery/porta_turret{
+	faction = list("playerInteq","turret")
+	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "zc" = (
@@ -989,7 +991,8 @@
 /area/ship/crew/cryo)
 "LV" = (
 /obj/machinery/porta_turret{
-	density = 0
+	density = 0;
+	faction = list("playerInteq","turret")
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
@@ -1070,7 +1073,9 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "MP" = (
-/obj/machinery/porta_turret,
+/obj/machinery/porta_turret{
+	faction = list("playerInteq","turret")
+	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "MV" = (
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
index 72d198a3bcc2..325439171a6d 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
@@ -5302,7 +5302,8 @@
 /area/ship/engineering/engine)
 "Ek" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 5
+	dir = 5;
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -5337,7 +5338,8 @@
 /area/ship/crew/dorm)
 "Ez" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 9
+	dir = 9;
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -6098,7 +6100,8 @@
 /area/ship/cargo/starboard)
 "JL" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 6
+	dir = 6;
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm
index c23229bc5e44..c29b8a1c6d67 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm
@@ -1288,7 +1288,7 @@
 "vd" = (
 /obj/machinery/porta_turret/ship/weak{
 	dir = 5;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /obj/docking_port/mobile{
 	dir = 2;
@@ -1436,7 +1436,7 @@
 "xX" = (
 /obj/machinery/porta_turret/ship/weak{
 	dir = 6;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -1595,7 +1595,7 @@
 "zP" = (
 /obj/machinery/porta_turret/ship/weak{
 	dir = 6;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -2885,7 +2885,7 @@
 "Td" = (
 /obj/machinery/porta_turret/ship/weak{
 	dir = 5;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
index 27a2a1bf66e3..75d6b02c8360 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
@@ -1800,7 +1800,8 @@
 /area/ship/cargo)
 "EW" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 9
+	dir = 9;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -1893,7 +1894,8 @@
 /area/ship/engineering)
 "Gu" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 5
+	dir = 5;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -2805,7 +2807,8 @@
 /area/ship/hallway/central)
 "YT" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 10
+	dir = 10;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm
index 2c9978499e5b..d750a8eceff7 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm
@@ -1268,7 +1268,8 @@
 /area/ship/engineering)
 "jH" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 9
+	dir = 9;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -2679,7 +2680,8 @@
 /area/ship/science/robotics)
 "WG" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 4
+	dir = 4;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -2798,7 +2800,8 @@
 /area/ship/science/robotics)
 "YZ" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 10
+	dir = 10;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm
index 3c04166a4ff8..4845e2ae490f 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm
@@ -3067,7 +3067,8 @@
 /area/ship/engineering)
 "Lo" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 1
+	dir = 1;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
index ecb69a93c663..024723b9264c 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
@@ -248,7 +248,10 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "rX" = (
-/obj/machinery/porta_turret/ship/ballistic,
+/obj/machinery/porta_turret/ship/ballistic{
+	faction = list("playerNanotrasen","turret");
+	dir = 5
+	},
 /turf/closed/wall/mineral/titanium/exterior,
 /area/ship/bridge)
 "ts" = (
@@ -289,6 +292,13 @@
 "vm" = (
 /turf/template_noop,
 /area/template_noop)
+"xx" = (
+/obj/machinery/porta_turret/ship/ballistic{
+	faction = list("playerNanotrasen","turret");
+	dir = 6
+	},
+/turf/closed/wall/mineral/titanium/exterior,
+/area/ship/bridge)
 "xy" = (
 /obj/structure/closet/wall/white/med{
 	pixel_y = -32
@@ -850,5 +860,5 @@ vm
 Sc
 nl
 nl
-Sc
+xx
 "}
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm
index f3f52cd1d36f..9f11ae00f3b8 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm
@@ -140,7 +140,8 @@
 /area/ship/science/robotics)
 "cl" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 5
+	dir = 5;
+	faction = list("playerSolgov","turret")
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/science/robotics)
@@ -625,7 +626,8 @@
 /area/ship/engineering/electrical)
 "jl" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 6
+	dir = 6;
+	faction = list("playerSolgov","turret")
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/security)
@@ -778,7 +780,8 @@
 /area/ship/engineering/atmospherics)
 "kU" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 10
+	dir = 10;
+	faction = list("playerSolgov","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/cargo)
@@ -1307,7 +1310,8 @@
 /area/ship/science/robotics)
 "qK" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 9
+	dir = 9;
+	faction = list("playerSolgov","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/cargo)
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
index a8a31f06c565..1afb9343a517 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
@@ -84,7 +84,8 @@
 /area/ship/hallway/central)
 "aq" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 9
+	dir = 9;
+	faction = list("playerSyndicate","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -271,7 +272,8 @@
 /area/ship/science)
 "aK" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 5
+	dir = 5;
+	faction = list("playerSyndicate","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -313,7 +315,8 @@
 /area/ship/hallway/aft)
 "aO" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 10
+	dir = 10;
+	faction = list("playerSyndicate","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3581,7 +3584,8 @@
 /area/ship/engineering/electrical)
 "gF" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 6
+	dir = 6;
+	faction = list("playerSyndicate","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 2daae8da986f..fe0ecc7be9ab 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -2874,7 +2874,6 @@
 /obj/item/clothing/shoes/combat,
 /obj/item/radio/headset/syndicate,
 /obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/suppressor,
 /obj/item/gun/ballistic/automatic/pistol/syndicate,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -3395,7 +3394,7 @@
 	pixel_y = 1
 	},
 /obj/item/clothing/mask/gas/syndicate{
-	pixel_x = -4
+	pixel_x = -5
 	},
 /obj/machinery/firealarm/directional/east,
 /obj/item/codespeak_manual/unlimited{
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
index 57312419ed11..2feb5cbfa0dd 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
@@ -692,9 +692,6 @@
 	pixel_y = 10;
 	pixel_x = 6
 	},
-/obj/item/suppressor{
-	pixel_y = 3
-	},
 /obj/item/stock_parts/cell/high{
 	pixel_y = 11;
 	pixel_x = 7
@@ -1160,7 +1157,7 @@
 /obj/effect/turf_decal/spline/plain/opaque/syndiered,
 /obj/structure/table/reinforced,
 /obj/item/documents/syndicate/red{
-	pixel_y = 4
+	pixel_y = 3
 	},
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm
index 2b3efc4a79d6..9ed6c62f0de8 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm
@@ -563,10 +563,6 @@
 "eA" = (
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/industrial/traffic/full,
-/obj/item/suppressor,
-/obj/item/suppressor{
-	pixel_y = 7
-	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/security/armory)
 "eJ" = (
@@ -4726,7 +4722,7 @@
 	pixel_y = 1
 	},
 /obj/item/clothing/glasses/night{
-	pixel_y = 6
+	pixel_y = 8
 	},
 /obj/item/clothing/glasses/night{
 	pixel_x = -2;
diff --git a/code/__DEFINES/~mod_celadon/access.dm b/code/__DEFINES/~mod_celadon/access.dm
index 618dd259b1ce..b76a2f963e03 100644
--- a/code/__DEFINES/~mod_celadon/access.dm
+++ b/code/__DEFINES/~mod_celadon/access.dm
@@ -2,3 +2,5 @@
 #define ACCESS_INTEQ_GENERAL 8484
 #define ACCESS_INTEQ_SECURITY 8485
 #define ACCESS_INTEQ_CAPTAIN 8486
+/// CELADON_FACTION elysium
+#define FACTION_PLAYER_ELYSIUM "playerElysium"
diff --git a/mod_celadon/faction/README.md b/mod_celadon/faction/README.md
new file mode 100644
index 000000000000..2c14feba2ce3
--- /dev/null
+++ b/mod_celadon/faction/README.md
@@ -0,0 +1,97 @@
+
+#### Список PRов
+
+- https://github.com/CeladonSS13/Shiptest/pulls/#####
+<!--
+  Ссылки на PRы, связанные с модом:
+  - Создание
+  - Большие изменения
+-->
+
+<!-- Название мода. Не важно на русском или на английском. -->
+## Фракции для шипов и оутфитов
+
+ID мода: CELADON_FACTION
+<!--
+  Название модпака прописными буквами, СОЕДИНЁННЫМИ_ПОДЧЁРКИВАНИЕМ,
+  которое ты будешь использовать для обозначения файлов.
+  При запуске скрипта выставляется автоматически.
+  Приставка CELADON гарантирует уникальность 
+  модпака. Этот ID будет использоваться для обозначения
+  изменений в кор коде, если того потребуется.
+-->
+
+### Описание мода
+
+Этот мод корректирует фракции под реалии целадона
+<!--
+  Что он делает, что добавляет: что, куда, зачем и почему - всё здесь.
+  А также любая полезная информация.
+-->
+
+### Используется в других проектах?
+- Нет
+<!--
+  ВНИМАНИЕ!
+  Заполняется другими авторами, кто использует этот модпак или
+  его часть в других модпаках! Для Автора модпака внимательно
+  отслеживать данный пункт при изменении своего кода!
+  Пример заполнения: `Используется часть кода для модпака EXAMP_EXAM`
+-->
+
+### Изменения *кор кода*
+
+- ADD `code\__DEFINES\~mod_celadon\access.dm`: `FACTION_PLAYER_ELYSIUM`
+<!--
+  Если вы редактировали какие-либо процедуры или переменные в кор коде,
+  они должны быть указаны здесь.
+  Нужно указать и файл, и процедуры/переменные.
+
+  Изменений нет - напиши "Отсутствуют"
+  Примеры: `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var`
+-->
+
+### Оверрайды
+
+- Отсутствуют
+<!--
+  Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
+  Здесь указываются оверрайды в твоём моде и папке `_master_files`
+
+  Изменений нет - напиши "Отсутствуют"
+  Примеры: 
+  - `mods/_master_files/sound/my_cool_sound.ogg`
+  - `mods/_master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var`
+-->
+
+### Дефайны
+
+- ADD `code\__DEFINES\~mod_celadon\access.dm`: `FACTION_PLAYER_ELYSIUM`
+<!--
+  Если требовалось добавить какие-либо дефайны, укажи файлы,
+  в которые ты их добавил, а также перечисли имена.
+  И то же самое, если ты используешь дефайны, определённые другим модом.
+
+  Не используешь - напиши "Отсутствуют"
+  Примеры: `code/__defines/~mods/faction.dm`: `FACTION_SPEED_MULTIPLIER`, `FACTION_SPEED_BASE`
+-->
+
+### Используемые файлы, не содержащиеся в модпаке
+
+- Отсутствуют
+<!--
+  Будь то немодульный файл или модульный файл, который не содержится в папке,
+  принадлежащей этому конкретному моду, он должен быть упомянут здесь.
+  Хорошими примерами являются иконки или звуки, которые используются одновременно
+  несколькими модулями, или что-либо подобное.
+  Примеры: `mods/_master_files/icons/obj/alien.dmi`
+-->
+
+### Авторы
+
+- Molniz
+<!--
+  Здесь находится твой никнейм
+  Если работал совместно - никнеймы тех, кто помогал.
+  В случае порта чего-либо должна быть ссылка на источник.
+-->
diff --git a/mod_celadon/faction/_faction.dm b/mod_celadon/faction/_faction.dm
new file mode 100644
index 000000000000..89924f7e5184
--- /dev/null
+++ b/mod_celadon/faction/_faction.dm
@@ -0,0 +1,27 @@
+/// name - название модпака. Используется для поиска других модпаков в init.
+/// desc - описание для модпака. Может использоваться для списка глаголов модпака в качестве описания.
+/// author - автор(ы) этого модпака.
+
+/datum/modpack/faction
+	name = "Фракции для шипов и оутфитов"
+	desc = "Добавляет фракции для оутфитов и для турелей на шипах"
+	author = "Molniz"
+
+/// Эти проки нужны, для того чтобы инициализировать датумы в определенный момент времени
+/// сборки билда. Инициализация обновляет данные в билде повторно, перезаписывая новыми значениями
+/// из модпака. Но иногда, сама инциализация есть и вызывается в кор коде в определенный момент, и
+/// тогда такие проки не нужны и вовсе. Также проки не нужны если в модпаке только объекты находятся.
+/// Если эти конструкции не нужны, просто закоментируй их!
+/// (можешь использовать все три, но запуск билда увеличится на 0.1 сек, за каждый датум в модпаке)
+
+// Инициализация ДО
+/datum/modpack/faction/pre_initialize()
+	. = ..()
+
+// Инициализация ВОВРЕМЯ
+/datum/modpack/faction/initialize()
+	. = ..()
+
+// Инициализация ПОСЛЕ
+/datum/modpack/faction/post_initialize()
+	. = ..()
diff --git a/mod_celadon/faction/_faction.dme b/mod_celadon/faction/_faction.dme
new file mode 100644
index 000000000000..14c10e8db071
--- /dev/null
+++ b/mod_celadon/faction/_faction.dme
@@ -0,0 +1,8 @@
+#ifndef MODPACK_CELADON_FACTION
+#define MODPACK_CELADON_FACTION
+
+#include "_faction.dm"
+
+#include "code/faction.dm"
+
+#endif
diff --git a/mod_celadon/faction/code/faction.dm b/mod_celadon/faction/code/faction.dm
new file mode 100644
index 000000000000..8c0fd04189b7
--- /dev/null
+++ b/mod_celadon/faction/code/faction.dm
@@ -0,0 +1,55 @@
+//	Syndicate
+/datum/outfit/job/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly)
+ 	. = ..()
+ 	H.faction |= list(FACTION_PLAYER_SYNDICATE,FACTION_ANTAG_SYNDICATE)
+
+//	Elysium
+/datum/outfit/job/elysium/assistant
+	name = "Elysium - Assistant"
+	job_icon = "captain"
+	jobtype = /datum/job/captain
+
+	uniform = /obj/item/clothing/under/utility
+	shoes = /obj/item/clothing/shoes/sneakers/black
+	box = /obj/item/storage/box/survival
+	id = /obj/item/card/id/silver
+
+/datum/outfit/job/elysium/proc/get_elysium_access(mob/living/carbon/human/H)
+	H.faction |= list(FACTION_PLAYER_ELYSIUM)
+	var/obj/item/storage/wallet/W = null
+	for (var/obj/item/O in H.contents)
+		if (istype(O, /obj/item/storage/wallet))
+			W = O
+			break
+	if (W)
+		var/obj/item/card/id/I = null
+		for (var/obj/item/O in W.contents)
+			if (istype(O, /obj/item/card/id/silver))
+				I = O
+				break
+		if (I)
+			I.access = list(ACCESS_MAINT_TUNNELS)
+			I.update_label()
+		W.combined_access = list()
+		for (var/obj/item/card/id/card in W.contents)
+			W.combined_access |= card.access
+
+/datum/outfit/job/elysium/assistant/post_equip(mob/living/carbon/human/H)
+	. = ..()
+	get_elysium_access(H)
+
+//	Nanotrasen
+/datum/outfit/job/nanotrasen/post_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	H.faction |= list(FACTION_PLAYER_NANOTRASEN,FACTION_PLAYER_SOLGOV)
+
+//	SolFed
+/datum/outfit/job/solgov/post_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	H.faction |= list(FACTION_PLAYER_SOLGOV,FACTION_PLAYER_NANOTRASEN)
+
+//	InteQ
+/datum/outfit/job/inteq/post_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	H.faction |= list(FACTION_PLAYER_INTEQ)
+
diff --git a/mod_celadon/mod_celadon.dme b/mod_celadon/mod_celadon.dme
index 8220c700b195..feb03629f357 100644
--- a/mod_celadon/mod_celadon.dme
+++ b/mod_celadon/mod_celadon.dme
@@ -18,6 +18,7 @@
 #include "accents_add/_accents_add.dme"
 #include "areas/_areas.dme"
 #include "map_expansion/_map_expansion.dme"
+#include "faction/_faction.dme"
 
 // --- ICONS --- //
 #include "species_changes/_species_changes.dme"