diff --git a/_maps/_mod_celadon/outpost/elysium_ice.dmm b/_maps/_mod_celadon/outpost/elysium_ice.dmm
index e561a3fe1f2a..cbebb04ce3e7 100644
--- a/_maps/_mod_celadon/outpost/elysium_ice.dmm
+++ b/_maps/_mod_celadon/outpost/elysium_ice.dmm
@@ -14294,6 +14294,7 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/light/floor,
 /turf/open/floor/plasteel/patterned/cargo_one{
 	light_color = "#1B1D2E";
 	light_range = 2
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm
index 1aac77600a1f..c0000da45401 100644
--- a/_maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm
+++ b/_maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm
@@ -2615,15 +2615,16 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/electrical)
 "zP" = (
-/mob/living/simple_animal/hostile/retaliate/goose{
-	name = "Khasir"
-	},
 /obj/effect/turf_decal/spline/fancy/wood{
 	dir = 8
 	},
 /obj/structure/chair/sofa/brown/corpo/left{
 	dir = 4
 	},
+/mob/living/simple_animal/hostile/retaliate/goose{
+	name = "Khasir";
+	faction = list("playerElysium")
+	},
 /turf/open/floor/carpet/green,
 /area/ship/security)
 "zV" = (
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm
index ae085a665e6d..d4c365f9e69f 100644
--- a/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm
+++ b/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm
@@ -737,7 +737,8 @@
 	color = "#808080"
 	},
 /mob/living/simple_animal/hostile/retaliate/goose{
-	name = "Khasir"
+	name = "Khasir";
+	faction = list("playerElysium")
 	},
 /turf/open/floor/plasteel/elevatorshaft{
 	color = "#808080"
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
index 94b651afaa60..8a52d0b09694 100644
--- a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
+++ b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
@@ -758,9 +758,7 @@
 "yX" = (
 /obj/structure/catwalk,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/porta_turret{
-	faction = list("playerElysium","turret")
-	},
+/obj/machinery/porta_turret/ship/faction/elysium/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "zc" = (
@@ -1110,9 +1108,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "MP" = (
-/obj/machinery/porta_turret{
-	faction = list("playerElysium","turret")
-	},
+/obj/machinery/porta_turret/ship/faction/elysium/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "MV" = (
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm
index e1c6fa5d7861..a90a9b605e33 100644
--- a/_maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm
+++ b/_maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm
@@ -282,6 +282,10 @@
 /obj/structure/sign/poster/elysium/random{
 	pixel_x = -32
 	},
+/mob/living/simple_animal/hostile/retaliate/goose{
+	name = "Khasir";
+	faction = list("playerElysium")
+	},
 /turf/open/floor/carpet/green,
 /area/ship/hallway/central)
 "iM" = (
@@ -735,6 +739,10 @@
 	color = "#758967"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/item/elysm_manual{
+	pixel_y = 5;
+	pixel_x = -10
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/bridge)
 "qP" = (
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_skipjack.dmm b/_maps/_mod_celadon/shuttles/independent/independent_skipjack.dmm
index 0fb2c7df715b..676333704ce3 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_skipjack.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_skipjack.dmm
@@ -2359,7 +2359,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Wg" = (
-/obj/item/circuitboard/computer/cargo/express,
+/obj/structure/rack,
+/obj/item/circuitboard/computer/cargo,
 /turf/open/floor/plasteel/dark,
 /area/ship/security/armory)
 "Wh" = (
@@ -3112,11 +3113,11 @@ Sc
 fa
 ll
 Il
-Wg
+KR
 eZ
 wD
 IP
-OR
+Wg
 gq
 Ix
 DU
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
index 224d4bf679ec..10cfea8033e2 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
@@ -1431,9 +1431,8 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/cryo)
 "qJ" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 9;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -2134,9 +2133,8 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "xh" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 5;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -3001,9 +2999,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Hu" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 6;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3280,9 +3277,8 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/security/armory)
 "Ll" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 5;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3529,9 +3525,8 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Oa" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 6;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -3815,9 +3810,8 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "QZ" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 10;
-	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 5938b19f0c82..45d07f195254 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
@@ -303,9 +303,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security/armory)
 "cM" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 5;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -462,9 +461,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "ej" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 6;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
index d86b52ffa3fb..ae614c695315 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
@@ -451,8 +451,7 @@
 "bU" = (
 /obj/machinery/light/directional/north,
 /obj/effect/decal/cleanable/robot_debris,
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq");
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover{
 	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,
@@ -1100,9 +1099,7 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/office)
 "gy" = (
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/bridge)
 "gF" = (
@@ -1132,9 +1129,7 @@
 /area/ship/maintenance/central)
 "gG" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "gJ" = (
@@ -1553,8 +1548,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "ji" = (
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq");
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover{
 	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,
@@ -2327,8 +2321,7 @@
 /area/ship/security/prison)
 "oN" = (
 /obj/effect/decal/cleanable/squid_ink,
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq");
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover{
 	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,
@@ -3330,9 +3323,7 @@
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/dorm)
 "vU" = (
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "vX" = (
@@ -6617,9 +6608,7 @@
 /turf/open/floor/mineral/titanium/white,
 /area/ship/medical)
 "PB" = (
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "PC" = (
@@ -7012,8 +7001,7 @@
 /area/ship/cargo/office)
 "SU" = (
 /obj/machinery/light/directional/north,
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq");
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover{
 	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
index 8e98a05b4062..5937efaa9815 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
@@ -700,9 +700,7 @@
 "yX" = (
 /obj/structure/catwalk,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/porta_turret{
-	faction = list("playerInteq","turret")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "zc" = (
@@ -990,9 +988,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "LV" = (
-/obj/machinery/porta_turret{
-	density = 0;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover{
+	density = 0
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
@@ -1073,9 +1070,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "MP" = (
-/obj/machinery/porta_turret{
-	faction = list("playerInteq","turret")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /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 325439171a6d..e98e88ec29ed 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
@@ -5301,9 +5301,8 @@
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Ek" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 5;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq{
+	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -5337,9 +5336,8 @@
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm)
 "Ez" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 9;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq{
+	dir = 9
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -6099,9 +6097,8 @@
 /turf/open/floor/plating/airless,
 /area/ship/cargo/starboard)
 "JL" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 6;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq{
+	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -8986,7 +8983,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "ZH" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/faction/inteq{
 	dir = 10
 	},
 /turf/closed/wall/mineral/plastitanium,
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm
index c29b8a1c6d67..fa79c669cdb2 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm
@@ -1286,9 +1286,8 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/crew/toilet)
 "vd" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 5;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq{
+	dir = 5
 	},
 /obj/docking_port/mobile{
 	dir = 2;
@@ -1434,9 +1433,8 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/cargo)
 "xX" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 6;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq{
+	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -1593,9 +1591,8 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "zP" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 6;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq{
+	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -2883,9 +2880,8 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Td" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 5;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq{
+	dir = 5
 	},
 /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 75d6b02c8360..7680cb938f9b 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
@@ -1210,6 +1210,12 @@
 "uF" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/medical)
+"uH" = (
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 5
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
 "vo" = (
 /obj/docking_port/stationary{
 	dwidth = 4;
@@ -1799,9 +1805,8 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "EW" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 9;
-	faction = list("playerNanotrasen","turret")
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 9
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -1893,9 +1898,8 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "Gu" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 5;
-	faction = list("playerNanotrasen","turret")
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 6
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -2806,9 +2810,8 @@
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "YT" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 10;
-	faction = list("playerNanotrasen","turret")
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 10
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -3017,7 +3020,7 @@ yI
 Co
 ze
 yI
-Gu
+YT
 "}
 (13,1,1) = {"
 pN
@@ -3149,7 +3152,7 @@ bA
 "}
 (21,1,1) = {"
 bA
-Gu
+uH
 Sn
 Sn
 Sn
@@ -3230,7 +3233,7 @@ bA
 (26,1,1) = {"
 bA
 bA
-Gu
+uH
 bX
 Ok
 cR
@@ -3265,7 +3268,7 @@ bA
 bA
 bA
 bA
-Gu
+uH
 Gm
 Gm
 qL
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm
index d750a8eceff7..1517aecfb068 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm
@@ -1267,9 +1267,8 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "jH" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 9;
-	faction = list("playerNanotrasen","turret")
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 9
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -2679,9 +2678,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/science/robotics)
 "WG" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 4;
-	faction = list("playerNanotrasen","turret")
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 6
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -2798,10 +2796,15 @@
 	},
 /turf/open/floor/plating,
 /area/ship/science/robotics)
+"YY" = (
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 5
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
 "YZ" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 10;
-	faction = list("playerNanotrasen","turret")
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 10
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -3364,7 +3367,7 @@ HJ
 "}
 (27,1,1) = {"
 aa
-WG
+YY
 ab
 aK
 qe
@@ -3374,7 +3377,7 @@ WG
 aa
 aa
 aa
-WG
+YY
 HJ
 DS
 TK
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm
index 4845e2ae490f..f66d3958dab3 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm
@@ -1882,6 +1882,12 @@
 /obj/effect/decal/cleanable/garbage,
 /turf/open/floor/plating,
 /area/ship/engineering)
+"mm" = (
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 6
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
 "my" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2849,6 +2855,12 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"Go" = (
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 5
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
 "Gr" = (
 /obj/structure/table,
 /obj/machinery/reagentgrinder{
@@ -3066,9 +3078,8 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Lo" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 1;
-	faction = list("playerNanotrasen","turret")
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 1
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -3436,6 +3447,10 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"SL" = (
+/obj/machinery/porta_turret/ship/faction/nanotrasen,
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
 "TQ" = (
 /obj/item/reagent_containers/food/snacks/canned/beans{
 	pixel_x = -5;
@@ -3889,7 +3904,7 @@ bj
 fX
 dK
 ac
-Lo
+SL
 aa
 "}
 (7,1,1) = {"
@@ -4214,7 +4229,7 @@ sA
 Uk
 an
 bD
-Lo
+SL
 aa
 "}
 (20,1,1) = {"
@@ -4420,12 +4435,12 @@ aa
 (28,1,1) = {"
 aa
 aa
-Lo
+Go
 ai
 ai
 ai
 ai
-Lo
+mm
 aa
 aa
 aa
@@ -4433,12 +4448,12 @@ aa
 aa
 aa
 aa
-Lo
+Go
 cO
 cO
 cO
 cO
-Lo
+mm
 aa
 aa
 "}
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm
index a46ff6584d38..05a23b4990e2 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm
@@ -1391,9 +1391,8 @@
 /turf/open/floor/carpet/blue,
 /area/ship/crew/dorm)
 "oI" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 8;
-	faction = list("playerNanotrasen","turret")
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 8
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/bridge)
@@ -1889,9 +1888,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "ve" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 6;
-	faction = list("playerNanotrasen","turret")
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 6
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -2536,9 +2534,8 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/hallway/central)
 "BD" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 9;
-	faction = list("playerNanotrasen","turret")
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 10
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/bridge)
@@ -3009,6 +3006,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
+"GP" = (
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 1
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
 "GY" = (
 /obj/structure/railing{
 	dir = 4
@@ -3252,9 +3255,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "JZ" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 5;
-	faction = list("playerNanotrasen","turret")
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 5
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -4142,6 +4144,12 @@
 /obj/structure/fluff/hedge/opaque,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
+"SZ" = (
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 9
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/bridge)
 "Ta" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4770,7 +4778,7 @@ fa
 fa
 fa
 fa
-BD
+SZ
 yz
 kl
 XT
@@ -4937,7 +4945,7 @@ fa
 fa
 fa
 fa
-Nt
+GP
 lI
 Ik
 du
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
index 024723b9264c..69b517539a4e 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
@@ -248,9 +248,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "rX" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	faction = list("playerNanotrasen","turret");
-	dir = 5
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
+	dir = 8
 	},
 /turf/closed/wall/mineral/titanium/exterior,
 /area/ship/bridge)
@@ -293,8 +292,7 @@
 /turf/template_noop,
 /area/template_noop)
 "xx" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	faction = list("playerNanotrasen","turret");
+/obj/machinery/porta_turret/ship/faction/nanotrasen{
 	dir = 6
 	},
 /turf/closed/wall/mineral/titanium/exterior,
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm
index 9f11ae00f3b8..d3869aa26222 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm
@@ -139,9 +139,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/science/robotics)
 "cl" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 5;
-	faction = list("playerSolgov","turret")
+/obj/machinery/porta_turret/ship/faction/solgov{
+	dir = 5
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/science/robotics)
@@ -625,9 +624,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/electrical)
 "jl" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 6;
-	faction = list("playerSolgov","turret")
+/obj/machinery/porta_turret/ship/faction/solgov{
+	dir = 6
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/security)
@@ -779,9 +777,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "kU" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 10;
-	faction = list("playerSolgov","turret")
+/obj/machinery/porta_turret/ship/faction/solgov{
+	dir = 10
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/cargo)
@@ -1309,9 +1306,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/science/robotics)
 "qK" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 9;
-	faction = list("playerSolgov","turret")
+/obj/machinery/porta_turret/ship/faction/solgov{
+	dir = 9
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/cargo)
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_inkwell.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_inkwell.dmm
index 8d77d0140081..58f51cf06eb8 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_inkwell.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_inkwell.dmm
@@ -1091,7 +1091,9 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "hE" = (
-/obj/machinery/porta_turret/ship/solgov,
+/obj/machinery/porta_turret/ship/faction/solgov{
+	dir = 6
+	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
 "hF" = (
@@ -3616,6 +3618,12 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/white,
 /area/ship/engineering)
+"wT" = (
+/obj/machinery/porta_turret/ship/faction/solgov{
+	dir = 5
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
 "wW" = (
 /obj/structure/table/wood,
 /obj/machinery/chem_dispenser/drinks{
@@ -4042,6 +4050,12 @@
 /obj/machinery/light/floor,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
+"zN" = (
+/obj/machinery/porta_turret/ship/faction/solgov{
+	dir = 10
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
 "zP" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
@@ -7253,6 +7267,12 @@
 /obj/machinery/newscaster/directional/south,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
+"WH" = (
+/obj/machinery/porta_turret/ship/faction/solgov{
+	dir = 9
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
 "WI" = (
 /obj/structure/table/wood,
 /obj/structure/reagent_dispensers/beerkeg,
@@ -7764,12 +7784,12 @@
 
 (1,1,1) = {"
 iG
-hE
+WH
 zI
 Hp
 Hp
 zI
-hE
+zN
 iG
 iG
 iG
@@ -7787,12 +7807,12 @@ iG
 iG
 iG
 iG
-hE
+WH
 ni
 dv
 dv
 ni
-hE
+zN
 iG
 iG
 "}
@@ -7967,7 +7987,7 @@ iG
 iG
 "}
 (7,1,1) = {"
-hE
+WH
 XY
 DE
 Cq
@@ -7997,7 +8017,7 @@ Np
 ts
 qx
 ts
-hE
+zN
 iG
 "}
 (8,1,1) = {"
@@ -8409,7 +8429,7 @@ sJ
 iG
 "}
 (20,1,1) = {"
-hE
+wT
 SI
 kK
 LJ
@@ -8920,7 +8940,7 @@ iG
 "}
 (35,1,1) = {"
 iG
-hE
+wT
 ea
 pc
 cH
@@ -8978,7 +8998,7 @@ iG
 iG
 iG
 iG
-hE
+wT
 qc
 qc
 FE
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_tomahawk.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_tomahawk.dmm
index 83a8144dc380..928194b3f152 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_tomahawk.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_tomahawk.dmm
@@ -89,7 +89,7 @@
 /turf/open/floor/wood,
 /area/ship/hallway/central)
 "aZ" = (
-/obj/machinery/porta_turret/ship/solgov{
+/obj/machinery/porta_turret/ship/faction/solgov{
 	dir = 6
 	},
 /turf/closed/wall/mineral/titanium,
@@ -221,7 +221,7 @@
 /turf/open/floor/engine/hull,
 /area/ship/external)
 "cQ" = (
-/obj/machinery/porta_turret/ship/solgov{
+/obj/machinery/porta_turret/ship/faction/solgov{
 	dir = 9
 	},
 /turf/closed/wall/mineral/titanium,
@@ -418,7 +418,7 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "eU" = (
-/obj/machinery/porta_turret/ship/solgov{
+/obj/machinery/porta_turret/ship/faction/solgov{
 	dir = 1
 	},
 /turf/closed/wall/mineral/titanium,
@@ -431,7 +431,7 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "fj" = (
-/obj/machinery/porta_turret/ship/solgov{
+/obj/machinery/porta_turret/ship/faction/solgov{
 	dir = 9
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -2950,7 +2950,7 @@
 /turf/open/floor/wood/ebony,
 /area/ship/hallway/central)
 "HD" = (
-/obj/machinery/porta_turret/ship/solgov{
+/obj/machinery/porta_turret/ship/faction/solgov{
 	dir = 10
 	},
 /turf/closed/wall/mineral/titanium,
@@ -3678,7 +3678,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/janitor)
 "Re" = (
-/obj/machinery/porta_turret/ship/solgov{
+/obj/machinery/porta_turret/ship/faction/solgov{
 	dir = 5
 	},
 /turf/closed/wall/mineral/titanium,
@@ -4340,7 +4340,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/crew/janitor)
 "VD" = (
-/obj/machinery/porta_turret/ship/solgov{
+/obj/machinery/porta_turret/ship/faction/solgov{
 	dir = 10
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
index e8d912d11345..0e699c8da76b 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
@@ -52,7 +52,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "bX" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 10
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -501,7 +501,7 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "lg" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 9
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -1001,9 +1001,9 @@
 /turf/template_noop,
 /area/template_noop)
 "xc" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
+	pixel_x = 7;
 	dir = 4;
-	pixel_x = 8;
 	pixel_y = 4
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -1290,7 +1290,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "Do" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -1572,9 +1572,10 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "KS" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
+	pixel_x = 7;
 	dir = 4;
-	pixel_x = 8
+	pixel_y = 5
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -1982,7 +1983,7 @@
 /turf/open/floor/carpet/red_gold,
 /area/ship/crew)
 "WB" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium,
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
index 1afb9343a517..e665db21da9d 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
@@ -83,9 +83,8 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "aq" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 9;
-	faction = list("playerSyndicate","turret")
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
+	dir = 9
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -271,9 +270,8 @@
 /turf/open/floor/plasteel/mono/white,
 /area/ship/science)
 "aK" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 5;
-	faction = list("playerSyndicate","turret")
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
+	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -314,9 +312,8 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/aft)
 "aO" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 10;
-	faction = list("playerSyndicate","turret")
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
+	dir = 10
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -480,7 +477,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "be" = (
-/obj/machinery/porta_turret/ship/ballistic,
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "bf" = (
@@ -3583,9 +3580,8 @@
 /turf/open/floor/plating,
 /area/ship/engineering/electrical)
 "gF" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 6;
-	faction = list("playerSyndicate","turret")
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
+	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm
index c002983e5fe0..8248906490c7 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm
@@ -487,7 +487,7 @@
 /turf/open/floor/carpet/blue,
 /area/ship/crew/dorm)
 "iT" = (
-/obj/machinery/porta_turret/ship/syndicate{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 1
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -889,7 +889,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/security/armory)
 "pB" = (
-/obj/machinery/porta_turret/ship/syndicate,
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "pH" = (
@@ -2258,7 +2258,7 @@
 /turf/open/floor/carpet/black,
 /area/ship/medical)
 "Mm" = (
-/obj/machinery/porta_turret/ship/syndicate{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 4
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -2486,7 +2486,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "QN" = (
-/obj/machinery/porta_turret/ship/ballistic,
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "QU" = (
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm
index ecd1b1ef16b7..cebc095127c1 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm
@@ -1680,11 +1680,11 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "BG" = (
-/obj/machinery/porta_turret/ship/ballistic,
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "BR" = (
-/obj/machinery/porta_turret/ship/syndicate{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 1
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -2331,7 +2331,7 @@
 /turf/open/floor/carpet/red_gold,
 /area/ship/bridge)
 "NA" = (
-/obj/machinery/porta_turret/ship/syndicate,
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "NF" = (
@@ -2498,7 +2498,7 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
 "Qz" = (
-/obj/machinery/porta_turret/ship/syndicate{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -2881,7 +2881,7 @@
 /turf/open/floor/carpet/red_gold,
 /area/ship/bridge)
 "Up" = (
-/obj/machinery/porta_turret/ship/syndicate/heavy{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 4
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -2897,7 +2897,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "UN" = (
-/obj/machinery/porta_turret/ship/syndicate{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 1
 	},
 /turf/closed/wall/mineral/plastitanium,
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index fe0ecc7be9ab..301499970ab8 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -313,7 +313,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/central)
 "ea" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -1094,7 +1094,7 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew/canteen)
 "kG" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 1
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -1671,7 +1671,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "pN" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 9
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -1871,7 +1871,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "rS" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -2915,7 +2915,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Bx" = (
-/obj/machinery/porta_turret/ship/syndicate/weak,
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic,
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "BK" = (
@@ -4121,7 +4121,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/central)
 "OP" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 10
 	},
 /turf/closed/wall/mineral/plastitanium,
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
index 2feb5cbfa0dd..de012e0f3553 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
@@ -199,7 +199,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "ee" = (
-/obj/machinery/porta_turret/ship/syndicate,
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic,
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "en" = (
@@ -937,7 +937,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "ud" = (
-/obj/machinery/porta_turret/ship/syndicate{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 8
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -1443,7 +1443,7 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/hallway/central)
 "Ei" = (
-/obj/machinery/porta_turret/ship/syndicate{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 4
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -2478,7 +2478,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "Xk" = (
-/obj/machinery/porta_turret/ship/syndicate{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 1
 	},
 /turf/closed/wall/mineral/plastitanium,
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_twinkleshine.dmm
index 61088900efb7..d269cd50a8f2 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -2142,7 +2142,7 @@
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
 "ms" = (
-/obj/machinery/porta_turret/ship/syndicate/heavy{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 9
 	},
 /turf/closed/wall/r_wall/syndicate/nodiagonal{
@@ -3550,7 +3550,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/atmospherics)
 "vd" = (
-/obj/machinery/porta_turret/ship/syndicate/heavy{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 5
 	},
 /turf/closed/wall/r_wall/syndicate/nodiagonal{
@@ -6714,7 +6714,7 @@
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
 "Mr" = (
-/obj/machinery/porta_turret/ship/syndicate/heavy{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 6
 	},
 /turf/closed/wall/r_wall/syndicate/nodiagonal{
@@ -8425,7 +8425,7 @@
 	},
 /area/ship/crew/cryo)
 "We" = (
-/obj/machinery/porta_turret/ship/syndicate/heavy{
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 10
 	},
 /turf/closed/wall/r_wall/syndicate/nodiagonal{
diff --git a/mod_celadon/faction/code/faction.dm b/mod_celadon/faction/code/faction.dm
index 8c0fd04189b7..673ba8b79b01 100644
--- a/mod_celadon/faction/code/faction.dm
+++ b/mod_celadon/faction/code/faction.dm
@@ -15,7 +15,6 @@
 	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))
@@ -38,6 +37,9 @@
 	. = ..()
 	get_elysium_access(H)
 
+/datum/outfit/job/elysium/post_equip(mob/living/carbon/human/H)
+	H.faction |= list(FACTION_PLAYER_ELYSIUM)
+
 //	Nanotrasen
 /datum/outfit/job/nanotrasen/post_equip(mob/living/carbon/human/H, visualsOnly)
 	. = ..()
@@ -52,4 +54,3 @@
 /datum/outfit/job/inteq/post_equip(mob/living/carbon/human/H, visualsOnly)
 	. = ..()
 	H.faction |= list(FACTION_PLAYER_INTEQ)
-
diff --git a/mod_celadon/repairs_other/README.md b/mod_celadon/repairs_other/README.md
index 915b9df49ab2..321272b3237e 100644
--- a/mod_celadon/repairs_other/README.md
+++ b/mod_celadon/repairs_other/README.md
@@ -92,7 +92,7 @@ ID мода: CELADON_REPAIRS_OTHER
 
 ### Авторы
 
-Ganza9991
+Ganza9991,Molniz
 <!--
   Здесь находится твой никнейм
   Если работал совместно - никнеймы тех, кто помогал.
diff --git a/mod_celadon/repairs_other/_repairs_other.dme b/mod_celadon/repairs_other/_repairs_other.dme
index 0bd25bd9249f..776c36491158 100644
--- a/mod_celadon/repairs_other/_repairs_other.dme
+++ b/mod_celadon/repairs_other/_repairs_other.dme
@@ -6,5 +6,6 @@
 #include "code/mobs.dm"
 #include "code/species.dm"
 #include "code/medicine.dm"
+#include "code/turret.dm"
 
 #endif
diff --git a/mod_celadon/repairs_other/code/turret.dm b/mod_celadon/repairs_other/code/turret.dm
new file mode 100644
index 000000000000..1b84fe91fee9
--- /dev/null
+++ b/mod_celadon/repairs_other/code/turret.dm
@@ -0,0 +1,111 @@
+// Офы написали турели говна и сидят радуются поэтому мы их переписываем
+// SOLGOV
+/obj/machinery/porta_turret/ship/faction/solgov
+	faction = list(FACTION_PLAYER_SOLGOV, "turret")
+
+/obj/machinery/porta_turret/ship/faction/solgov/ballistic
+	stun_projectile = /obj/projectile/bullet/turret/rubber
+	lethal_projectile = /obj/projectile/bullet/turret
+	lethal_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	desc = "A ballistic machine gun auto-turret."
+
+/obj/machinery/porta_turret/ship/faction/solgov/laser
+	icon_state = "standard_stun"
+	base_icon_state = "standard"
+
+/obj/machinery/porta_turret/ship/faction/solgov/laser/cover
+	installation = /obj/item/gun/energy/e_gun/turret
+	has_cover = 1
+	always_up = 0
+	icon_state = "turretCover"
+	base_icon_state = "standard"
+
+// SYNDICATE
+/obj/machinery/porta_turret/ship/faction/syndicate
+	faction = list(FACTION_PLAYER_SYNDICATE, "turret")
+
+/obj/machinery/porta_turret/ship/faction/syndicate/ballistic
+	stun_projectile = /obj/projectile/bullet/turret/rubber
+	lethal_projectile = /obj/projectile/bullet/turret
+	lethal_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	desc = "A ballistic machine gun auto-turret."
+
+/obj/machinery/porta_turret/ship/faction/syndicate/laser
+	icon_state = "standard_stun"
+	base_icon_state = "standard"
+
+/obj/machinery/porta_turret/ship/faction/syndicate/laser/cover
+	installation = /obj/item/gun/energy/e_gun/turret
+	has_cover = 1
+	always_up = 0
+	cover = /obj/item/gun/energy/e_gun/turret
+	icon_state = "turretCover"
+	base_icon_state = "standard"
+
+// JOHN TRASEN
+/obj/machinery/porta_turret/ship/faction/nanotrasen
+	faction = list(FACTION_PLAYER_NANOTRASEN, "turret")
+
+/obj/machinery/porta_turret/ship/faction/nanotrasen/ballistic
+	stun_projectile = /obj/projectile/bullet/turret/rubber
+	lethal_projectile = /obj/projectile/bullet/turret
+	lethal_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	desc = "A ballistic machine gun auto-turret."
+
+/obj/machinery/porta_turret/ship/faction/nanotrasen/laser
+	icon_state = "standard_stun"
+	base_icon_state = "standard"
+
+/obj/machinery/porta_turret/ship/faction/nanotrasen/laser/cover
+	installation = /obj/item/gun/energy/e_gun/turret
+	has_cover = 1
+	always_up = 0
+	icon_state = "turretCover"
+	base_icon_state = "standard"
+
+// INTEQ
+/obj/machinery/porta_turret/ship/faction/inteq
+	faction = list(FACTION_PLAYER_INTEQ, "turret")
+
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic
+	stun_projectile = /obj/projectile/bullet/turret/rubber
+	lethal_projectile = /obj/projectile/bullet/turret
+	lethal_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	desc = "A ballistic machine gun auto-turret."
+
+/obj/machinery/porta_turret/ship/faction/inteq/laser
+	icon_state = "standard_stun"
+	base_icon_state = "standard"
+
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover
+	installation = /obj/item/gun/energy/e_gun/turret
+	has_cover = 1
+	always_up = 0
+	icon_state = "turretCover"
+	base_icon_state = "standard"
+
+// ELYSIUM
+/obj/machinery/porta_turret/ship/faction/elysium
+	faction = list(FACTION_PLAYER_ELYSIUM, "turret")
+
+/obj/machinery/porta_turret/ship/faction/elysium/ballistic
+	stun_projectile = /obj/projectile/bullet/turret/rubber
+	lethal_projectile = /obj/projectile/bullet/turret
+	lethal_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	desc = "A ballistic machine gun auto-turret."
+
+/obj/machinery/porta_turret/ship/faction/elysium/laser
+	icon_state = "standard_stun"
+	base_icon_state = "standard"
+
+/obj/machinery/porta_turret/ship/faction/elysium/laser/cover
+	installation = /obj/item/gun/energy/e_gun/turret
+	has_cover = 1
+	always_up = 0
+	icon_state = "turretCover"
+	base_icon_state = "standard"