diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index 48610006ae5..3534643bea9 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -707,7 +707,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/mob/living/basic/syndicate/ranged/smg/space,
+/mob/living/basic/trooper/syndicate/ranged/smg/space,
 /turf/open/floor/iron/airless,
 /area/shuttle/ruin/caravan/freighter3)
 "Cj" = (
@@ -978,7 +978,7 @@
 /area/shuttle/ruin/caravan/freighter3)
 "PF" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/basic/syndicate/ranged/smg/space,
+/mob/living/basic/trooper/syndicate/ranged/smg/space,
 /turf/open/floor/iron/airless,
 /area/shuttle/ruin/caravan/freighter3)
 "PY" = (
@@ -1134,7 +1134,7 @@
 /obj/effect/turf_decal/box/white/corners{
 	dir = 4
 	},
-/mob/living/basic/syndicate/ranged/shotgun/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/ranged/shotgun/space/stormtrooper,
 /turf/open/floor/iron/dark/airless,
 /area/shuttle/ruin/caravan/freighter3)
 "Zz" = (
diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
index 92f998e1ae8..4bcfbd0805e 100644
--- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
@@ -519,7 +519,7 @@
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
 "cd" = (
 /obj/machinery/light/directional/south,
-/mob/living/simple_animal/hostile/nanotrasen/ranged/assault,
+/mob/living/basic/trooper/nanotrasen/ranged/assault,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
 "ce" = (
@@ -796,7 +796,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/nanotrasen/elite,
+/mob/living/basic/trooper/nanotrasen/ranged/elite,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
 "cR" = (
@@ -1084,7 +1084,7 @@
 	dir = 10
 	},
 /obj/item/wrench,
-/mob/living/simple_animal/hostile/nanotrasen/ranged/assault,
+/mob/living/basic/trooper/nanotrasen/ranged/assault,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
 "tO" = (
@@ -1105,7 +1105,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
 "yf" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged/assault,
+/mob/living/basic/trooper/nanotrasen/ranged/assault,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
 "yv" = (
diff --git a/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm b/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm
index 2560cefa8a1..60bc78ed8e7 100644
--- a/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm
+++ b/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm
@@ -173,7 +173,7 @@
 	pixel_x = -1;
 	pixel_y = 5
 	},
-/mob/living/basic/syndicate/melee/space,
+/mob/living/basic/trooper/syndicate/melee/space,
 /turf/open/floor/iron/dark/airless,
 /area/ruin/space)
 "eU" = (
diff --git a/_maps/RandomRuins/SpaceRuins/waystation.dmm b/_maps/RandomRuins/SpaceRuins/waystation.dmm
index 9577f92ea79..59a30852096 100644
--- a/_maps/RandomRuins/SpaceRuins/waystation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/waystation.dmm
@@ -44,7 +44,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/waystation)
 "bA" = (
-/mob/living/basic/syndicate/melee/sword/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/waystation/securestorage)
 "bG" = (
@@ -65,7 +65,7 @@
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/waystation/kitchen)
 "bR" = (
-/mob/living/basic/syndicate/ranged/shotgun/space,
+/mob/living/basic/trooper/syndicate/ranged/shotgun/space,
 /obj/item/ammo_casing/shotgun/buckshot/spent{
 	pixel_x = 3;
 	pixel_y = 10
@@ -1972,7 +1972,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/waystation/cargobay)
 "JM" = (
-/mob/living/basic/syndicate/ranged/shotgun/space,
+/mob/living/basic/trooper/syndicate/ranged/shotgun/space,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/waystation/cargobay)
 "Kc" = (
@@ -2132,7 +2132,7 @@
 "LW" = (
 /obj/effect/turf_decal/loading_area/red,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/mob/living/basic/syndicate/ranged/smg/space,
+/mob/living/basic/trooper/syndicate/ranged/smg/space,
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/waystation/cargobay)
@@ -2612,7 +2612,7 @@
 /area/ruin/space/has_grav/waystation/dorms)
 "UC" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/mob/living/basic/syndicate/ranged/smg/space,
+/mob/living/basic/trooper/syndicate/ranged/smg/space,
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/waystation/cargooffice)
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index 18429389d87..c0c0d0a8c04 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -60,7 +60,7 @@
 /turf/closed/wall/r_wall,
 /area/awaymission/research/interior/engineering)
 "as" = (
-/mob/living/basic/syndicate/ranged/smg,
+/mob/living/basic/trooper/syndicate/ranged/smg,
 /turf/open/floor/mineral/plastitanium/red,
 /area/awaymission/research/interior/engineering)
 "at" = (
@@ -91,7 +91,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/mob/living/basic/syndicate,
+/mob/living/basic/trooper/syndicate,
 /turf/open/floor/mineral/plastitanium/red,
 /area/awaymission/research/interior/engineering)
 "az" = (
@@ -185,7 +185,7 @@
 /turf/open/floor/plating,
 /area/awaymission/research/interior/engineering)
 "aT" = (
-/mob/living/basic/syndicate/melee/sword,
+/mob/living/basic/trooper/syndicate/melee/sword,
 /turf/open/floor/plating,
 /area/awaymission/research/interior/engineering)
 "aU" = (
@@ -553,7 +553,7 @@
 /area/awaymission/research/interior/maint)
 "cz" = (
 /obj/structure/cable,
-/mob/living/basic/syndicate/ranged/smg,
+/mob/living/basic/trooper/syndicate/ranged/smg,
 /turf/open/floor/plating,
 /area/awaymission/research/interior/maint)
 "cA" = (
@@ -581,7 +581,7 @@
 /area/awaymission/research/interior/gateway)
 "cL" = (
 /obj/structure/cable,
-/mob/living/basic/syndicate/ranged,
+/mob/living/basic/trooper/syndicate/ranged,
 /turf/open/floor/plating,
 /area/awaymission/research/interior/maint)
 "cM" = (
@@ -696,7 +696,7 @@
 /area/awaymission/research/interior)
 "dn" = (
 /obj/item/ammo_casing/c45,
-/mob/living/basic/syndicate,
+/mob/living/basic/trooper/syndicate,
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 8
 	},
@@ -779,7 +779,7 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/secure)
 "dP" = (
-/mob/living/basic/syndicate/ranged/smg,
+/mob/living/basic/trooper/syndicate/ranged/smg,
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior/medbay)
@@ -826,7 +826,7 @@
 /turf/open/floor/iron/stairs,
 /area/awaymission/research/interior/genetics)
 "ec" = (
-/mob/living/basic/syndicate/ranged/smg,
+/mob/living/basic/trooper/syndicate/ranged/smg,
 /turf/open/floor/plating,
 /area/awaymission/research/interior/maint)
 "ed" = (
@@ -918,7 +918,7 @@
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior/cryo)
 "eB" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged,
+/mob/living/basic/trooper/nanotrasen/ranged,
 /obj/effect/turf_decal/tile/purple/half/contrasted{
 	dir = 1
 	},
@@ -967,7 +967,7 @@
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior)
 "eL" = (
-/mob/living/basic/syndicate,
+/mob/living/basic/trooper/syndicate,
 /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
 	dir = 4
 	},
@@ -1019,7 +1019,7 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/secure)
 "eV" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg,
+/mob/living/basic/trooper/nanotrasen/ranged/smg,
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/secure)
 "eW" = (
@@ -1098,7 +1098,7 @@
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior)
 "fn" = (
-/mob/living/basic/syndicate/melee/sword,
+/mob/living/basic/trooper/syndicate/melee/sword,
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior)
 "fo" = (
@@ -1159,7 +1159,7 @@
 /area/awaymission/research/interior/secure)
 "fA" = (
 /obj/machinery/light/small/directional/west,
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg,
+/mob/living/basic/trooper/nanotrasen/ranged/smg,
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/secure)
 "fD" = (
@@ -1289,7 +1289,7 @@
 /area/awaymission/research/interior/secure)
 "gj" = (
 /obj/structure/cable,
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg,
+/mob/living/basic/trooper/nanotrasen/ranged/smg,
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/secure)
 "gk" = (
@@ -1469,7 +1469,7 @@
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior/security)
 "hq" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg,
+/mob/living/basic/trooper/nanotrasen/ranged/smg,
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 1
 	},
@@ -1807,7 +1807,7 @@
 /turf/open/floor/iron/freezer,
 /area/awaymission/research/interior/bathroom)
 "iQ" = (
-/mob/living/basic/syndicate,
+/mob/living/basic/trooper/syndicate,
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 4
 	},
@@ -2963,7 +2963,7 @@
 /turf/open/floor/iron,
 /area/awaymission/research/interior/security)
 "sn" = (
-/mob/living/basic/syndicate/ranged/smg,
+/mob/living/basic/trooper/syndicate/ranged/smg,
 /obj/effect/turf_decal/tile/green/fourcorners,
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior)
@@ -3166,7 +3166,7 @@
 	pixel_x = 32;
 	pixel_y = 26
 	},
-/mob/living/basic/syndicate/ranged/smg,
+/mob/living/basic/trooper/syndicate/ranged/smg,
 /obj/effect/turf_decal/tile/green/fourcorners,
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior)
@@ -3184,7 +3184,7 @@
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior)
 "yW" = (
-/mob/living/simple_animal/hostile/nanotrasen,
+/mob/living/basic/trooper/nanotrasen,
 /obj/effect/turf_decal/tile/purple/fourcorners,
 /turf/open/floor/iron,
 /area/awaymission/research/interior/cryo)
@@ -3264,7 +3264,7 @@
 /turf/open/floor/iron,
 /area/awaymission/research/interior/genetics)
 "BQ" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg,
+/mob/living/basic/trooper/nanotrasen/ranged/smg,
 /obj/effect/turf_decal/tile/red/fourcorners,
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior/security)
@@ -3346,7 +3346,7 @@
 /turf/open/floor/iron,
 /area/awaymission/research/interior/genetics)
 "DY" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged,
+/mob/living/basic/trooper/nanotrasen/ranged,
 /obj/effect/turf_decal/tile/purple/fourcorners,
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior/cryo)
@@ -3788,7 +3788,7 @@
 /turf/open/floor/iron,
 /area/awaymission/research/interior/genetics)
 "Qq" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged,
+/mob/living/basic/trooper/nanotrasen/ranged,
 /obj/effect/turf_decal/tile/red/fourcorners,
 /turf/open/floor/iron,
 /area/awaymission/research/interior/security)
@@ -3868,7 +3868,7 @@
 /turf/open/misc/asteroid,
 /area/awaymission/research/exterior)
 "Th" = (
-/mob/living/basic/syndicate,
+/mob/living/basic/trooper/syndicate,
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior/medbay)
@@ -3923,7 +3923,7 @@
 /turf/open/floor/plating,
 /area/awaymission/research/interior/maint)
 "Uq" = (
-/mob/living/basic/syndicate/ranged/smg/space,
+/mob/living/basic/trooper/syndicate/ranged/smg/space,
 /turf/open/misc/asteroid/airless,
 /area/awaymission/research/exterior)
 "Uu" = (
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
index daec7174ddf..687bb1e66f4 100644
--- a/_maps/map_files/Birdshot/birdshot.dmm
+++ b/_maps/map_files/Birdshot/birdshot.dmm
@@ -85,14 +85,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/engineering/atmos/project)
-"acO" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "acS" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -528,6 +520,10 @@
 /obj/item/clothing/mask/gas/owl_mask,
 /turf/open/floor/wood,
 /area/station/maintenance/fore/greater)
+"akF" = (
+/obj/effect/landmark/transport/nav_beacon/tram/nav/immovable_rod,
+/turf/closed/wall,
+/area/station/maintenance/port/aft)
 "akR" = (
 /obj/effect/turf_decal/tile/dark_red/half/contrasted{
 	dir = 1
@@ -1093,6 +1089,12 @@
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/medical/pharmacy)
+"awe" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/turf/open/floor/tram,
+/area/station/security/tram)
 "awi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/chair/plastic{
@@ -1195,11 +1197,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"ays" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/structure/frame/machine,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "ayu" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -1321,6 +1318,15 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/xenobiology)
+"aAV" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/structure/frame/computer{
+	dir = 1
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "aBs" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -1412,6 +1418,10 @@
 	},
 /turf/closed/wall,
 /area/station/hallway/primary/central/fore)
+"aCR" = (
+/obj/effect/landmark/transport/nav_beacon/tram/platform/birdshot/maint_right,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "aCZ" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/structure/rack,
@@ -1426,6 +1436,10 @@
 	},
 /turf/open/floor/plating/airless,
 /area/station/science/ordnance/bomb)
+"aEa" = (
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "aEc" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 1
@@ -1769,6 +1783,17 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/construction/mining/aux_base)
+"aLv" = (
+/obj/structure/transport/linear/tram,
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/obj/structure/fluff/tram_rail/floor{
+	dir = 1
+	},
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "aLA" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
@@ -1919,6 +1944,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth,
 /area/station/engineering/supermatter/room)
+"aOX" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 6
+	},
+/turf/open/floor/tram,
+/area/station/security/tram)
 "aOZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/pickaxe,
@@ -1936,13 +1967,6 @@
 "aPb" = (
 /turf/open/floor/plating/rust,
 /area/station/engineering/atmos/project)
-"aPe" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/thermoplastic,
-/obj/effect/landmark/transport/nav_beacon/tram/platform/birdshot/sec_wing,
-/obj/effect/landmark/transport/nav_beacon/tram/nav/birdshot/prison,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "aPh" = (
 /obj/structure/window/reinforced/plasma/spawner/directional/north,
 /obj/effect/turf_decal/stripes/white/line{
@@ -2462,12 +2486,15 @@
 	dir = 8
 	},
 /area/station/command/corporate_showroom)
-"aYO" = (
+"aYv" = (
+/obj/structure/transport/linear/tram,
 /obj/effect/turf_decal/stripes/white/line{
-	dir = 1
+	dir = 8
 	},
+/obj/structure/fluff/tram_rail/floor,
+/obj/structure/tram,
 /turf/open/floor/tram,
-/area/station/security/tram)
+/area/station/maintenance/port/aft)
 "aYR" = (
 /obj/structure/broken_flooring/singular/directional/east,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2973,6 +3000,9 @@
 /obj/effect/spawner/random/maintenance,
 /turf/open/floor/plating/rust,
 /area/station/maintenance/fore/greater)
+"bjZ" = (
+/turf/open/floor/tram,
+/area/station/security/tram)
 "bka" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3152,6 +3182,13 @@
 /obj/item/wrench,
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
+"bmT" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "bnc" = (
 /obj/structure/table/reinforced/titaniumglass,
 /obj/item/pipe_dispenser,
@@ -3215,6 +3252,13 @@
 /obj/structure/cable,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/surgery/theatre)
+"boI" = (
+/obj/machinery/mecha_part_fabricator/maint{
+	name = "forgotten exosuit fabricator"
+	},
+/obj/machinery/light/small/broken/directional/west,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
 "boK" = (
 /obj/effect/turf_decal/stripes/asteroid/end{
 	dir = 1
@@ -3361,11 +3405,33 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/workout)
+"bro" = (
+/obj/structure/frame/machine,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "brw" = (
 /obj/effect/decal/cleanable/glass,
 /obj/structure/grille,
 /turf/open/floor/plating,
 /area/station/hallway/primary/port)
+"bry" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical{
+	pixel_x = -2;
+	pixel_y = 8
+	},
+/obj/machinery/requests_console/directional/west{
+	department = "Ordnance Test Range";
+	name = "Test Range Requests Console"
+	},
+/obj/effect/mapping_helpers/requests_console/information,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/item/storage/toolbox/mechanical{
+	pixel_x = 3;
+	pixel_y = -2
+	},
+/turf/open/floor/iron,
+/area/station/science/ordnance/testlab)
 "brz" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/effect/decal/cleanable/dirt,
@@ -4218,12 +4284,6 @@
 /obj/machinery/telecomms/server/presets/science,
 /turf/open/floor/circuit,
 /area/station/tcommsat/server)
-"bFG" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/item/stack/sheet/mineral/titanium,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "bFM" = (
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
@@ -4699,13 +4759,6 @@
 /obj/machinery/computer/records/security,
 /turf/open/floor/wood/tile,
 /area/station/command/bridge)
-"bQz" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "bQU" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -4762,6 +4815,13 @@
 /obj/effect/spawner/random/structure/grille,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
+"bRN" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "bSj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
@@ -4857,12 +4917,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/rust,
 /area/station/maintenance/department/engine)
-"bUo" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 9
-	},
-/turf/open/floor/tram,
-/area/station/security/tram)
 "bUr" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/turf_decal/tile/blue{
@@ -4935,6 +4989,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
+"bUO" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/obj/machinery/light/cold/directional/west,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "bUX" = (
 /obj/effect/turf_decal/tile/yellow,
 /turf/open/floor/iron/dark,
@@ -5191,14 +5252,6 @@
 /obj/effect/turf_decal/box/red,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai)
-"caE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/transport/tram/directional/south{
-	specific_transport_id = "bird_2";
-	id = 1
-	},
-/turf/open/floor/iron,
-/area/station/maintenance/port/aft)
 "caI" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/glass,
@@ -5854,13 +5907,6 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/station/engineering/supermatter)
-"coH" = (
-/obj/machinery/mecha_part_fabricator/maint{
-	name = "forgotten exosuit fabricator"
-	},
-/obj/machinery/light/small/broken/directional/west,
-/turf/open/floor/plating,
-/area/station/maintenance/port/aft)
 "coJ" = (
 /obj/structure/chair/stool/directional/east,
 /obj/effect/decal/cleanable/dirt,
@@ -6027,13 +6073,6 @@
 	},
 /turf/open/floor/engine,
 /area/station/maintenance/disposal/incinerator)
-"crr" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 6
-	},
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "crE" = (
 /obj/structure/window/spawner/directional/north,
 /turf/open/space/basic,
@@ -6057,6 +6096,14 @@
 /obj/structure/flora/bush/flowers_pp/style_random,
 /turf/open/floor/grass,
 /area/station/service/hydroponics/garden/monastery)
+"css" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 10
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "csw" = (
 /obj/structure/window/reinforced/spawner/directional/south,
 /obj/effect/turf_decal/stripes/end,
@@ -6144,13 +6191,6 @@
 /obj/machinery/light/cold/directional/north,
 /turf/open/floor/iron,
 /area/station/security/prison/rec)
-"cuG" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "cuS" = (
 /obj/effect/mapping_helpers/broken_floor,
 /obj/effect/decal/cleanable/dirt,
@@ -6213,17 +6253,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance/testlab)
-"cwd" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/obj/machinery/computer/tram_controls{
-	specific_transport_id = "bird_2"
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "cwf" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -6642,6 +6671,12 @@
 	},
 /turf/open/space/basic,
 /area/space/nearstation)
+"cDt" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/structure/transport/linear/tram,
+/obj/structure/thermoplastic,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "cDy" = (
 /obj/structure/cable,
 /turf/open/floor/iron/white/side{
@@ -6949,14 +6984,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
-"cID" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/thermoplastic,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "cIE" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -6979,13 +7006,6 @@
 /obj/structure/chair/stool/directional/east,
 /turf/open/floor/iron/small,
 /area/station/maintenance/department/engine)
-"cJu" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "cJz" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -7404,6 +7424,12 @@
 /obj/item/vending_refill/hydroseeds,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/aft)
+"cRW" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 9
+	},
+/turf/open/floor/tram,
+/area/station/security/tram)
 "cSk" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/structure/closet/l3closet,
@@ -7462,12 +7488,6 @@
 "cSC" = (
 /turf/closed/wall,
 /area/station/commons/vacant_room/office)
-"cSD" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/fluff/tram_rail/floor,
-/obj/structure/thermoplastic/light,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "cSR" = (
 /obj/structure/chair{
 	dir = 1
@@ -7808,6 +7828,22 @@
 /obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/station/maintenance/port/aft)
+"cZA" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/transport/nav_beacon/tram/nav/immovable_rod,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
+"cZC" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/thermoplastic,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "cZL" = (
 /obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
@@ -7886,12 +7922,6 @@
 "dbF" = (
 /turf/open/floor/plating/rust,
 /area/station/ai_monitored/turret_protected/aisat/maint)
-"dbO" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "dbR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -8004,6 +8034,12 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/medical/pharmacy)
+"ddq" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "ddy" = (
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
@@ -8197,10 +8233,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
-"dhX" = (
-/obj/item/stack/sheet/mineral/titanium,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "dim" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -8463,6 +8495,15 @@
 /obj/structure/tank_holder/extinguisher/advanced,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"dlx" = (
+/obj/structure/flora/bush/flowers_br/style_random,
+/obj/structure/flora/rock/pile/style_random,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/siding/wideplating{
+	dir = 4
+	},
+/turf/open/misc/sandy_dirt,
+/area/station/security/tram)
 "dlz" = (
 /obj/machinery/light/small/directional/east,
 /obj/structure/closet/secure_closet/medical3,
@@ -8502,6 +8543,11 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/disposal/incinerator)
+"dmG" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "dmT" = (
 /obj/machinery/camera/directional/north{
 	c_tag = "Xenobiology - Cell 2";
@@ -8692,6 +8738,12 @@
 /obj/structure/firelock_frame,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/department/engine/atmos)
+"dpR" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/turf/open/floor/tram,
+/area/station/security/tram)
 "dqj" = (
 /obj/effect/turf_decal/stripes/red/line,
 /obj/effect/turf_decal/stripes/red/line{
@@ -8782,6 +8834,14 @@
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
 /area/station/security/lockers)
+"dsU" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 6
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "dtj" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -9070,14 +9130,6 @@
 /obj/machinery/portable_atmospherics/canister,
 /turf/open/floor/plating,
 /area/station/engineering/atmos/storage/gas)
-"dyn" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "dyp" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/effect/decal/cleanable/dirt,
@@ -9308,14 +9360,6 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/carpet/royalblack,
 /area/station/commons/dorms)
-"dBF" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 9
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "dBH" = (
 /turf/open/floor/iron/white/corner{
 	dir = 1
@@ -9370,6 +9414,14 @@
 	dir = 1
 	},
 /area/station/service/library)
+"dCs" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 9
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "dCH" = (
 /obj/structure/table,
 /obj/item/storage/box/lights/mixed{
@@ -9472,6 +9524,12 @@
 /obj/machinery/vending/cigarette,
 /turf/open/floor/iron/kitchen/small,
 /area/station/security/breakroom)
+"dEF" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 5
+	},
+/turf/open/floor/tram,
+/area/station/security/tram)
 "dER" = (
 /obj/machinery/power/emitter,
 /obj/effect/turf_decal/stripes/white/line{
@@ -9535,6 +9593,12 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/medical/chemistry)
+"dHn" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 10
+	},
+/turf/open/floor/tram,
+/area/station/security/tram)
 "dHC" = (
 /obj/structure/cable,
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
@@ -9671,6 +9735,11 @@
 /obj/effect/turf_decal/tile/yellow/opposingcorners,
 /turf/open/floor/iron,
 /area/station/maintenance/department/engine/atmos)
+"dJz" = (
+/obj/structure/chair/stool/directional/west,
+/mob/living/basic/trooper/russian/ranged/lootless,
+/turf/open/floor/carpet/orange,
+/area/station/service/abandoned_gambling_den)
 "dJN" = (
 /obj/machinery/griddle,
 /turf/open/floor/plating,
@@ -9762,13 +9831,6 @@
 	dir = 1
 	},
 /area/station/maintenance/disposal/incinerator)
-"dLd" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 10
-	},
-/obj/item/stack/sheet/mineral/titanium,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "dLf" = (
 /obj/effect/turf_decal/tile/yellow/opposingcorners,
 /obj/structure/table/reinforced/titaniumglass,
@@ -10158,6 +10220,14 @@
 /obj/machinery/meter,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
+"dSV" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 5
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "dTa" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -10652,6 +10722,13 @@
 	},
 /turf/open/floor/iron/small,
 /area/station/security/prison/shower)
+"dZT" = (
+/obj/machinery/button/transport/tram/directional/south{
+	specific_transport_id = "bird_2";
+	id = 2
+	},
+/turf/open/floor/iron,
+/area/station/maintenance/department/medical/central)
 "dZZ" = (
 /obj/structure/cable/layer3,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -10852,10 +10929,6 @@
 /obj/machinery/status_display/ai/directional/north,
 /turf/open/floor/iron/smooth,
 /area/station/ai_monitored/turret_protected/aisat_interior)
-"edW" = (
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "eeb" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -12288,6 +12361,13 @@
 /obj/machinery/status_display/evac/directional/east,
 /turf/open/floor/circuit/red,
 /area/station/ai_monitored/turret_protected/ai)
+"eDt" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "eDy" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -12357,11 +12437,6 @@
 /obj/item/stamp/head/hos,
 /turf/open/floor/carpet/red,
 /area/station/command/heads_quarters/hos)
-"eEl" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/thermoplastic/light,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "eEq" = (
 /obj/effect/turf_decal/bot_white,
 /obj/effect/turf_decal/stripes/corner,
@@ -12383,10 +12458,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth,
 /area/station/ai_monitored/turret_protected/aisat/equipment)
-"eFi" = (
-/obj/structure/frame/machine,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "eFk" = (
 /obj/structure/cable/layer3,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -13039,6 +13110,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos)
+"eQC" = (
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "eQJ" = (
 /obj/structure/cable,
 /turf/open/floor/iron/stairs{
@@ -13193,14 +13269,6 @@
 /obj/effect/landmark/start/roboticist,
 /turf/open/floor/iron/grimy,
 /area/station/science/cubicle)
-"eTq" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "eTr" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -13319,14 +13387,6 @@
 /obj/machinery/light/warm/directional/east,
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/station/maintenance/port/aft)
-"eVe" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 6
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "eVu" = (
 /obj/effect/mapping_helpers/broken_floor,
 /obj/structure/chair/sofa/bench{
@@ -13515,9 +13575,6 @@
 /obj/machinery/portable_atmospherics/pump,
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos)
-"fay" = (
-/turf/open/floor/tram,
-/area/station/security/tram)
 "faB" = (
 /obj/structure/table/wood,
 /obj/item/book/bible,
@@ -13627,15 +13684,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/rd)
-"fbX" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/fluff/tram_rail/end{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/station/maintenance/port/aft)
 "fca" = (
 /obj/structure/flora/bush/lavendergrass/style_random,
 /obj/structure/flora/bush/flowers_br/style_random,
@@ -14222,15 +14270,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"fos" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/fluff/tram_rail/end{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/station/maintenance/port/aft)
 "fov" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/machinery/vending/security,
@@ -14350,15 +14389,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
-"fqT" = (
-/obj/effect/turf_decal/stripes/white/corner{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/white/corner{
-	dir = 8
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "frf" = (
 /obj/structure/table/glass,
 /obj/item/defibrillator/loaded{
@@ -14402,13 +14432,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/station/command/heads_quarters/ce)
-"frB" = (
-/obj/machinery/button/transport/tram/directional/south{
-	specific_transport_id = "bird_2";
-	id = 2
-	},
-/turf/open/floor/iron,
-/area/station/maintenance/department/medical/central)
 "frI" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/turf_decal/tile/neutral{
@@ -14604,12 +14627,6 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/stone,
 /area/station/command/heads_quarters/hos)
-"fuk" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "fun" = (
 /obj/structure/cable/layer3,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -16165,6 +16182,12 @@
 /obj/effect/mapping_helpers/airlock/access/all/command/minisat,
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/station/ai_monitored/turret_protected/aisat_interior)
+"fTd" = (
+/obj/structure/transport/linear/tram,
+/obj/effect/landmark/transport/transport_id/birdshot/line_1,
+/obj/structure/thermoplastic,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "fTe" = (
 /turf/closed/wall/r_wall,
 /area/station/ai_monitored/turret_protected/aisat_interior)
@@ -16324,12 +16347,6 @@
 /obj/machinery/camera/directional/east,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
-"fWh" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "fWr" = (
 /obj/structure/closet/crate,
 /obj/structure/barricade/wooden/crude,
@@ -16403,6 +16420,14 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/station/ai_monitored/turret_protected/aisat/foyer)
+"fXD" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "fXJ" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment,
@@ -16785,6 +16810,13 @@
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"ggh" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "ggi" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -17002,12 +17034,6 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space/nearstation)
-"gjr" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/spawner/random/structure/girder,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "gjL" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/heat_exchanging/junction{
@@ -17032,6 +17058,15 @@
 	},
 /turf/open/floor/engine/vacuum,
 /area/station/engineering/atmos)
+"gkq" = (
+/obj/structure/transport/linear/tram,
+/obj/effect/turf_decal/stripes/white/corner,
+/obj/effect/turf_decal/stripes/white/corner{
+	dir = 4
+	},
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "gkw" = (
 /obj/structure/cable,
 /obj/machinery/light_switch/directional/west,
@@ -17062,12 +17097,6 @@
 /obj/machinery/power/apc/auto_name/directional/west,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"gkO" = (
-/obj/structure/rack,
-/obj/structure/transport/linear/tram,
-/obj/structure/thermoplastic,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "glb" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/brown/full,
@@ -17238,6 +17267,15 @@
 /obj/machinery/keycard_auth/directional/south,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
+"gow" = (
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
+"goB" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 6
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "goE" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 4
@@ -17621,12 +17659,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer1,
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos)
-"gwh" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "gwo" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
@@ -18176,6 +18208,14 @@
 /obj/machinery/camera/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/dock)
+"gFZ" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 6
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "gGc" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -18896,6 +18936,17 @@
 /obj/effect/gibspawner/human,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
+"gSs" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 10
+	},
+/obj/item/stack/sheet/mineral/titanium,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
+"gSz" = (
+/obj/item/stack/sheet/mineral/titanium,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "gSD" = (
 /obj/machinery/mass_driver/chapelgun{
 	dir = 8
@@ -18957,20 +19008,6 @@
 	},
 /turf/open/floor/carpet/executive,
 /area/station/command/meeting_room)
-"gTk" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/thermoplastic/light,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
-"gTC" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 6
-	},
-/turf/open/floor/tram,
-/area/station/security/tram)
 "gTH" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -19208,14 +19245,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
-"gXd" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 9
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "gXf" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/effect/decal/cleanable/dirt,
@@ -19735,6 +19764,34 @@
 	dir = 1
 	},
 /area/station/command/gateway)
+"heT" = (
+/obj/structure/table,
+/obj/machinery/airalarm/directional/west,
+/obj/item/pipe_dispenser{
+	pixel_x = 3;
+	pixel_y = -1
+	},
+/obj/item/assembly/timer{
+	pixel_x = -3;
+	pixel_y = 13
+	},
+/obj/item/transfer_valve{
+	pixel_x = 10;
+	pixel_y = 21
+	},
+/obj/item/transfer_valve{
+	pixel_x = 7;
+	pixel_y = 19
+	},
+/obj/item/transfer_valve{
+	pixel_x = 4;
+	pixel_y = 17
+	},
+/obj/item/pipe_dispenser{
+	pixel_y = 4
+	},
+/turf/open/floor/iron,
+/area/station/science/ordnance/testlab)
 "hfc" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/maintenance/three,
@@ -20152,6 +20209,14 @@
 /obj/structure/sign/poster/official/random/directional/west,
 /turf/open/floor/iron/smooth,
 /area/station/commons/storage/tools)
+"hmf" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "hmg" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
@@ -20189,10 +20254,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/white/small,
 /area/station/science/ordnance/storage)
-"hmB" = (
-/obj/effect/landmark/transport/nav_beacon/tram/platform/birdshot/maint_right,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "hmQ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/table,
@@ -20936,12 +20997,6 @@
 "hzm" = (
 /turf/closed/wall/rust,
 /area/station/cargo/miningoffice)
-"hzI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
 "hzK" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
@@ -21776,6 +21831,11 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
+"hPq" = (
+/obj/effect/turf_decal/siding/wood,
+/mob/living/basic/trooper/russian/ranged/lootless,
+/turf/open/floor/wood,
+/area/station/service/abandoned_gambling_den)
 "hPs" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/airalarm/directional/south,
@@ -21972,15 +22032,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/showroomfloor,
 /area/station/commons/toilet/restrooms)
-"hUT" = (
-/obj/structure/flora/bush/flowers_br/style_random,
-/obj/structure/flora/rock/pile/style_random,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/siding/wideplating{
-	dir = 4
-	},
-/turf/open/misc/sandy_dirt,
-/area/station/security/tram)
 "hVb" = (
 /obj/machinery/plate_press,
 /obj/effect/turf_decal/stripes/line,
@@ -22189,12 +22240,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/engine,
 /area/station/engineering/gravity_generator)
-"hYz" = (
-/obj/structure/transport/linear/tram,
-/obj/machinery/transport/tram_controller,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "hYC" = (
 /turf/closed/wall,
 /area/station/engineering/atmos)
@@ -22336,17 +22381,6 @@
 /obj/machinery/holopad,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/rd)
-"iaZ" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/thermoplastic/light,
-/obj/machinery/door/airlock/tram{
-	transport_linked_id = "bird_2"
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "ibe" = (
 /obj/effect/turf_decal/bot_white,
 /obj/structure/closet/crate/freezer,
@@ -22643,6 +22677,13 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
+"igD" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "ihc" = (
 /obj/structure/cable,
 /obj/machinery/door/airlock/command/glass{
@@ -23065,10 +23106,6 @@
 	},
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/command/meeting_room)
-"ipn" = (
-/obj/effect/turf_decal/stripes/white/line,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "ips" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -23244,18 +23281,6 @@
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /turf/open/floor/iron/dark/textured,
 /area/station/command/heads_quarters/hop)
-"isf" = (
-/obj/effect/turf_decal/stripes/white/corner{
-	dir = 4
-	},
-/obj/structure/transport/linear/tram,
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/obj/structure/fluff/tram_rail/floor,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "isi" = (
 /obj/structure/table,
 /obj/effect/turf_decal/siding/thinplating_new{
@@ -23319,14 +23344,6 @@
 "itb" = (
 /turf/closed/wall/r_wall/rust,
 /area/station/ai_monitored/turret_protected/aisat/maint)
-"itv" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/structure/thermoplastic,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "itw" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
@@ -23411,14 +23428,6 @@
 /obj/machinery/power/apc/worn_out/directional/east,
 /turf/open/floor/plating,
 /area/station/maintenance/hallway/abandoned_command)
-"ius" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "iut" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -23653,11 +23662,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/security/brig/entrance)
-"iyk" = (
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "iyq" = (
 /obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
 	dir = 9
@@ -23802,13 +23806,6 @@
 /obj/structure/cable,
 /turf/open/floor/wood/tile,
 /area/station/maintenance/port/lesser)
-"iBV" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/white/line,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "iBZ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
@@ -24433,6 +24430,13 @@
 /obj/effect/mapping_helpers/airlock/abandoned,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
+"iNO" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 6
+	},
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "iNV" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
@@ -24597,12 +24601,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark/small,
 /area/station/service/chapel/storage)
-"iRp" = (
-/obj/structure/transport/linear/tram,
-/obj/effect/landmark/transport/transport_id/birdshot/line_1,
-/obj/structure/thermoplastic,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "iRv" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
@@ -24802,6 +24800,19 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
+"iVq" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 10
+	},
+/obj/item/stack/sheet/mineral/titanium,
+/turf/open/floor/tram,
+/area/station/security/tram)
+"iVu" = (
+/obj/structure/transport/linear/tram,
+/obj/machinery/transport/tram_controller,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "iVx" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -25224,6 +25235,12 @@
 	},
 /turf/open/floor/wood/parquet,
 /area/station/command/heads_quarters/cmo)
+"jbt" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "jbV" = (
 /obj/machinery/photocopier,
 /turf/open/floor/iron/dark,
@@ -25408,13 +25425,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/greater)
-"jfX" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 6
-	},
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "jfZ" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -26178,13 +26188,11 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/aft)
-"jwC" = (
-/obj/structure/transport/linear/tram,
-/obj/effect/landmark/transport/nav_beacon/tram/nav/birdshot/maint,
-/obj/effect/landmark/transport/nav_beacon/tram/platform/birdshot/maint_left,
-/obj/structure/thermoplastic/light,
+"jwZ" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/structure/frame/machine,
 /turf/open/floor/tram,
-/area/station/maintenance/port/aft)
+/area/station/security/tram)
 "jxd" = (
 /obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2{
 	dir = 9
@@ -26379,6 +26387,17 @@
 	},
 /turf/open/floor/iron/kitchen/small,
 /area/station/hallway/secondary/service)
+"jzg" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/thermoplastic/light,
+/obj/machinery/door/airlock/tram{
+	transport_linked_id = "bird_2"
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "jzo" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -26709,13 +26728,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/office)
-"jEX" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/obj/machinery/light/cold/directional/west,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "jEZ" = (
 /obj/structure/hedge,
 /obj/effect/decal/cleanable/dirt,
@@ -26907,6 +26919,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/cargo/sorting)
+"jHI" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 5
+	},
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "jHU" = (
 /obj/structure/chair/sofa/bench/left{
 	dir = 8
@@ -27612,14 +27631,6 @@
 /obj/item/instrument/harmonica,
 /turf/open/floor/iron,
 /area/station/security/prison/rec)
-"jUN" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/obj/machinery/computer/tram_controls{
-	specific_transport_id = "bird_1"
-	},
-/turf/open/floor/tram,
-/area/station/security/tram)
 "jVe" = (
 /obj/structure/cable,
 /turf/open/floor/iron/smooth,
@@ -27642,17 +27653,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/recreation)
-"jVX" = (
-/obj/structure/transport/linear/tram,
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/obj/structure/fluff/tram_rail/floor{
-	dir = 1
-	},
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "jWd" = (
 /obj/structure/cable,
 /obj/item/kirbyplants/random/fullysynthetic,
@@ -27814,12 +27814,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
-"jYd" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 5
-	},
-/turf/open/floor/tram,
-/area/station/security/tram)
 "jYr" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/machinery/mecha_part_fabricator{
@@ -28010,6 +28004,14 @@
 /obj/structure/broken_flooring/corner/directional/south,
 /turf/open/floor/plating,
 /area/station/maintenance/hallway/abandoned_recreation)
+"kbc" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/thermoplastic/light,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "kbE" = (
 /obj/effect/decal/cleanable/blood/gibs/body,
 /obj/machinery/light/small/broken/directional/north,
@@ -28133,13 +28135,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/storage)
-"kef" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 5
-	},
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "kel" = (
 /obj/machinery/light/cold/directional/south,
 /obj/machinery/modular_computer/preset/id{
@@ -28147,6 +28142,15 @@
 	},
 /turf/open/floor/wood/parquet,
 /area/station/command/heads_quarters/cmo)
+"keq" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/fluff/tram_rail/end{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
 "ket" = (
 /turf/open/floor/iron,
 /area/station/security/prison/work)
@@ -28263,6 +28267,18 @@
 /obj/machinery/newscaster/directional/east,
 /turf/open/floor/wood,
 /area/station/service/chapel/funeral)
+"khl" = (
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/tram,
+/area/station/security/tram)
+"khp" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 9
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "khD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/watertank,
@@ -28295,6 +28311,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/security/execution/transfer)
+"khQ" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/fluff/tram_rail/floor,
+/obj/structure/thermoplastic,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "khS" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -28380,20 +28402,6 @@
 /obj/effect/spawner/random/structure/grille,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
-"kjn" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
-	},
-/obj/structure/holosign/barrier/atmos/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "kjw" = (
 /obj/effect/turf_decal/tile/blue,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -28545,6 +28553,11 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/carpet/orange,
 /area/station/service/abandoned_gambling_den)
+"klY" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "kmb" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -28604,6 +28617,12 @@
 	},
 /turf/open/floor/plating,
 /area/station/cargo/storage)
+"kms" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
 "kmC" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -28830,12 +28849,6 @@
 "kqX" = (
 /turf/closed/wall,
 /area/station/ai_monitored/aisat/exterior)
-"kqZ" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 5
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "krc" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -28933,6 +28946,13 @@
 /obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/spacebridge)
+"ksv" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "ksx" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -28971,13 +28991,6 @@
 	},
 /turf/open/floor/catwalk_floor/iron,
 /area/station/engineering/gravity_generator)
-"ksL" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 5
-	},
-/obj/item/stack/sheet/mineral/titanium,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "ksN" = (
 /obj/structure/transit_tube/station/dispenser,
 /obj/effect/decal/cleanable/dirt,
@@ -29090,11 +29103,6 @@
 /obj/effect/turf_decal/trimline/neutral/line,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
-"kvb" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/thermoplastic,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "kvf" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
@@ -29226,10 +29234,6 @@
 /obj/structure/window/spawner/directional/east,
 /turf/open/floor/plating/rust,
 /area/station/maintenance/fore/lesser)
-"kye" = (
-/obj/effect/landmark/transport/nav_beacon/tram/platform/birdshot/prison_wing,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "kyr" = (
 /obj/structure/window/reinforced/spawner/directional/south,
 /obj/machinery/airalarm/directional/west,
@@ -29266,13 +29270,6 @@
 /obj/effect/turf_decal/trimline/neutral/line,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
-"kyS" = (
-/obj/effect/turf_decal/stripes/white/corner,
-/obj/effect/turf_decal/stripes/white/line,
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "kyT" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/event_spawn,
@@ -29923,13 +29920,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark/side,
 /area/station/science/xenobiology)
-"kKy" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "kKB" = (
 /obj/structure/window/spawner/directional/west,
 /obj/structure/window/spawner/directional/south,
@@ -29990,12 +29980,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron/showroomfloor,
 /area/station/commons/toilet/restrooms)
-"kLG" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/turf/open/floor/tram,
-/area/station/security/tram)
 "kLS" = (
 /turf/open/floor/iron/stairs{
 	dir = 1
@@ -30043,15 +30027,6 @@
 /obj/structure/closet/emcloset,
 /turf/open/floor/iron/small,
 /area/station/maintenance/department/medical/central)
-"kNA" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/turf/open/floor/tram,
-/area/station/security/tram)
 "kND" = (
 /turf/closed/wall/r_wall,
 /area/station/security/prison)
@@ -30294,14 +30269,6 @@
 /obj/machinery/holopad,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/qm)
-"kSo" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/thermoplastic,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "kSr" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -30758,6 +30725,14 @@
 /obj/effect/landmark/start/bitrunner,
 /turf/open/floor/iron/dark/smooth_half,
 /area/station/bitrunning/den)
+"lbG" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "lbM" = (
 /obj/structure/chair/sofa/bench/right{
 	dir = 1
@@ -31373,12 +31348,6 @@
 /obj/structure/window/reinforced/spawner/directional/west,
 /turf/open/floor/iron,
 /area/station/maintenance/fore/greater)
-"liU" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 6
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "ljk" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -31807,6 +31776,10 @@
 	},
 /turf/open/floor/wood/parquet,
 /area/station/service/library)
+"lqL" = (
+/obj/effect/landmark/transport/nav_beacon/tram/platform/birdshot/prison_wing,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "lrh" = (
 /obj/structure/cable,
 /obj/effect/spawner/random/trash,
@@ -32015,18 +31988,6 @@
 	},
 /turf/open/floor/wood/parquet,
 /area/station/service/greenroom)
-"lvM" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/public/glass{
-	name = "Prison Garden"
-	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/textured_half{
-	dir = 8
-	},
-/area/station/security/prison/garden)
 "lvS" = (
 /obj/machinery/porta_turret/ai{
 	dir = 4
@@ -32853,11 +32814,6 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/station/engineering/supermatter/room)
-"lJE" = (
-/obj/structure/chair/stool/directional/west,
-/mob/living/basic/syndicate/russian/ranged/lootless,
-/turf/open/floor/carpet/orange,
-/area/station/service/abandoned_gambling_den)
 "lJV" = (
 /obj/structure/bed,
 /obj/effect/decal/cleanable/dirt,
@@ -33513,6 +33469,12 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/cargo/storage)
+"lTU" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 10
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "lUo" = (
 /turf/open/floor/iron,
 /area/station/science/lobby)
@@ -34123,6 +34085,10 @@
 /obj/effect/landmark/start/chief_medical_officer,
 /turf/open/floor/wood/parquet,
 /area/station/command/heads_quarters/cmo)
+"mdr" = (
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "mdt" = (
 /turf/closed/wall/r_wall,
 /area/station/science/robotics/mechbay)
@@ -34548,25 +34514,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/department/science/xenobiology)
-"mmf" = (
-/obj/structure/table,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/item/assembly/timer{
-	pixel_x = -3;
-	pixel_y = 9
-	},
-/obj/item/assembly/timer{
-	pixel_y = 7
-	},
-/obj/machinery/light_switch/directional/south,
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/item/holosign_creator/atmos,
-/obj/item/holosign_creator/atmos{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/turf/open/floor/iron,
-/area/station/science/ordnance/testlab)
 "mmi" = (
 /obj/structure/chair/sofa/bench/left{
 	dir = 4
@@ -34631,6 +34578,17 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/security/execution/transfer)
+"mnb" = (
+/obj/effect/turf_decal/stripes/white/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "mnc" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -35524,6 +35482,13 @@
 /obj/machinery/light_switch/directional/south,
 /turf/open/floor/iron/white,
 /area/station/science/cytology)
+"mET" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/item/stack/sheet/mineral/titanium,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "mEU" = (
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/showroomfloor,
@@ -35622,13 +35587,6 @@
 /obj/structure/sink/directional/west,
 /turf/open/floor/iron/white/small,
 /area/station/medical/storage)
-"mGQ" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/structure/frame/machine,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "mGT" = (
 /obj/structure/cable,
 /obj/machinery/door/airlock{
@@ -35677,15 +35635,6 @@
 /obj/effect/landmark/start/virologist,
 /turf/open/floor/iron/white/small,
 /area/station/medical/virology)
-"mId" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/button/transport/tram/directional/north{
-	specific_transport_id = "bird_1";
-	id = 1
-	},
-/obj/machinery/transport/destination_sign/indicator/directional/north,
-/turf/open/floor/noslip,
-/area/station/security/tram)
 "mIg" = (
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/catwalk_floor/iron_dark,
@@ -36052,6 +36001,14 @@
 /obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
 /turf/open/floor/plating,
 /area/station/maintenance/aft)
+"mNG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/button/transport/tram/directional/south{
+	specific_transport_id = "bird_2";
+	id = 1
+	},
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
 "mNN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/button/door/directional/east{
@@ -36507,6 +36464,13 @@
 /obj/machinery/status_display/evac/directional/north,
 /turf/open/floor/iron/dark/small,
 /area/station/medical/storage)
+"mXD" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/obj/item/stack/sheet/mineral/titanium,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "mXT" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -36800,6 +36764,12 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/ai_monitored/turret_protected/ai_upload)
+"ndp" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "ndq" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -36810,13 +36780,6 @@
 	},
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/maintenance/central/greater)
-"ndA" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "ndM" = (
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/iron,
@@ -36997,6 +36960,12 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/office)
+"nhx" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "nhB" = (
 /obj/effect/mapping_helpers/broken_floor,
 /obj/effect/decal/cleanable/dirt,
@@ -38598,13 +38567,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/small,
 /area/station/maintenance/solars/starboard/fore)
-"nJm" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "nJx" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -39380,6 +39342,16 @@
 "nZx" = (
 /turf/closed/mineral/random/stationside,
 /area/station/ai_monitored/turret_protected/ai)
+"nZz" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/holosign/barrier/atmos/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "nZM" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable,
@@ -39431,14 +39403,6 @@
 /obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai_upload_foyer)
-"oaE" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 6
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "oaV" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -39494,13 +39458,6 @@
 "ocb" = (
 /turf/open/floor/iron/white/small,
 /area/station/science/cubicle)
-"ocg" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/item/stack/sheet/mineral/titanium,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "ocs" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -40803,12 +40760,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
-"oBo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/transport/nav_beacon/tram/nav/immovable_rod,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
 "oBA" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment,
@@ -40927,6 +40878,20 @@
 	},
 /turf/open/floor/iron/white/small,
 /area/station/science/server)
+"oDY" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/structure/holosign/barrier/atmos/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "oEi" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/decal/cleanable/dirt,
@@ -41088,15 +41053,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
-"oGS" = (
-/obj/structure/transport/linear/tram,
-/obj/effect/turf_decal/stripes/white/corner,
-/obj/effect/turf_decal/stripes/white/corner{
-	dir = 4
-	},
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "oHa" = (
 /obj/structure/table,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -41133,6 +41089,13 @@
 /obj/structure/table,
 /turf/open/floor/iron,
 /area/station/commons)
+"oIK" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/structure/frame/machine,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "oIP" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
@@ -41189,6 +41152,13 @@
 /obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron/dark/small,
 /area/station/medical/morgue)
+"oJA" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/fluff/tram_rail/floor,
+/obj/structure/thermoplastic,
+/obj/structure/chair/sofa/bench/tram/solo,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "oJE" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41398,17 +41368,6 @@
 /obj/structure/alien/weeds,
 /turf/open/floor/iron,
 /area/station/maintenance/starboard/greater)
-"oNM" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/structure/transport/linear/tram,
-/obj/machinery/transport/tram_controller{
-	configured_transport_id = "bird_2"
-	},
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "oNX" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41486,6 +41445,17 @@
 /obj/machinery/portable_atmospherics/canister,
 /turf/open/floor/iron,
 /area/station/maintenance/port/fore)
+"oOL" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/structure/transport/linear/tram,
+/obj/machinery/transport/tram_controller{
+	configured_transport_id = "bird_2"
+	},
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "oPc" = (
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/machinery/computer/upload/borg{
@@ -41742,6 +41712,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/port/greater)
+"oTI" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "oTL" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/rust,
@@ -41841,18 +41818,6 @@
 /obj/structure/broken_flooring/singular/directional/east,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
-"oVE" = (
-/obj/structure/flora/bush/large/style_random{
-	pixel_x = -18;
-	pixel_y = -9
-	},
-/obj/structure/flora/bush/flowers_yw/style_random,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/siding/wideplating{
-	dir = 4
-	},
-/turf/open/misc/sandy_dirt,
-/area/station/security/tram)
 "oVK" = (
 /obj/structure/chair{
 	pixel_y = -2
@@ -41919,17 +41884,6 @@
 /obj/machinery/duct,
 /turf/open/floor/plating,
 /area/station/maintenance/central/greater)
-"oXh" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/fluff/tram_rail/floor{
-	dir = 1
-	},
-/obj/structure/thermoplastic,
-/obj/structure/chair/sofa/bench/tram/right{
-	dir = 1
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "oXs" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/emcloset,
@@ -42104,6 +42058,14 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
+"paI" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "paL" = (
 /obj/structure/fireplace,
 /obj/effect/turf_decal/siding/wood/end,
@@ -42218,6 +42180,12 @@
 /obj/structure/broken_flooring/corner/directional/south,
 /turf/open/floor/plating,
 /area/station/hallway/secondary/recreation)
+"pdf" = (
+/obj/structure/transport/linear/tram,
+/obj/effect/landmark/transport/transport_id/birdshot/line_2,
+/obj/structure/thermoplastic/light,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "pds" = (
 /obj/structure/cable,
 /obj/machinery/holopad,
@@ -42350,6 +42318,15 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/iron/small,
 /area/station/maintenance/port/lesser)
+"pfd" = (
+/obj/effect/turf_decal/stripes/white/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/white/corner{
+	dir = 8
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "pfh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/alien/weeds,
@@ -42404,16 +42381,6 @@
 	dir = 8
 	},
 /area/station/service/bar/backroom)
-"pfY" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/holosign/barrier/atmos/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "pgh" = (
 /obj/effect/turf_decal/tile/red/fourcorners,
 /obj/structure/table/reinforced/titaniumglass,
@@ -42595,6 +42562,12 @@
 /obj/structure/broken_flooring/singular/directional/south,
 /turf/open/floor/iron,
 /area/station/maintenance/starboard/aft)
+"pje" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/spawner/random/structure/girder,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "pjn" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/machinery/dna_scannernew,
@@ -43018,9 +42991,6 @@
 /obj/structure/window/reinforced/spawner/directional/east,
 /turf/open/space/basic,
 /area/space)
-"pqf" = (
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "pqm" = (
 /turf/closed/wall/r_wall,
 /area/station/engineering/storage/tcomms)
@@ -43098,11 +43068,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/cafeteria,
 /area/station/service/kitchen)
-"prT" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "prW" = (
 /obj/effect/turf_decal/stripes/red/line{
 	dir = 8
@@ -43415,13 +43380,6 @@
 	},
 /turf/open/floor/iron/white/side,
 /area/station/science/research)
-"pwG" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/white/line,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
 "pwJ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -43454,15 +43412,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
-"pxs" = (
-/obj/structure/transport/linear/tram,
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/obj/structure/fluff/tram_rail/floor,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "pxw" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -43611,6 +43560,13 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/security/checkpoint/customs/auxiliary)
+"pzN" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 5
+	},
+/obj/item/stack/sheet/mineral/titanium,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "pzR" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -43813,6 +43769,12 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/recreation)
+"pCC" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/turf/open/floor/tram,
+/area/station/security/tram)
 "pCF" = (
 /obj/machinery/door/window/brigdoor/right/directional/east{
 	id = "Cell 2";
@@ -43871,15 +43833,6 @@
 	},
 /turf/open/floor/wood/tile,
 /area/station/service/lawoffice)
-"pDG" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/structure/frame/computer{
-	dir = 1
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "pDQ" = (
 /obj/structure/cable,
 /obj/structure/table/glass,
@@ -44302,6 +44255,13 @@
 /obj/effect/turf_decal/delivery/red,
 /turf/open/floor/iron/white/small,
 /area/station/medical/medbay/central)
+"pKp" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 6
+	},
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "pKR" = (
 /obj/effect/turf_decal/tile/blue/anticorner/contrasted{
 	dir = 4
@@ -44460,13 +44420,6 @@
 	},
 /turf/open/floor/wood/tile,
 /area/station/command/corporate_showroom)
-"pNm" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "pNy" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
@@ -44494,17 +44447,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/white/small,
 /area/station/science/lab)
-"pNT" = (
-/obj/structure/transport/linear/tram,
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/obj/structure/fluff/tram_rail/floor{
-	dir = 1
-	},
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "pOb" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -45121,6 +45063,14 @@
 	},
 /turf/open/floor/iron/dark/small,
 /area/station/science/xenobiology)
+"pXh" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "pXo" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -45642,17 +45592,6 @@
 	},
 /turf/open/misc/sandy_dirt,
 /area/station/security/tram)
-"qfw" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/fluff/tram_rail/floor{
-	dir = 1
-	},
-/obj/structure/thermoplastic,
-/obj/structure/chair/sofa/bench/tram/left{
-	dir = 1
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "qfz" = (
 /obj/item/kirbyplants/organic/applebush,
 /obj/machinery/light/small/directional/south,
@@ -45934,34 +45873,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"qiH" = (
-/obj/structure/table,
-/obj/machinery/airalarm/directional/west,
-/obj/item/pipe_dispenser{
-	pixel_x = 3;
-	pixel_y = -1
-	},
-/obj/item/assembly/timer{
-	pixel_x = -3;
-	pixel_y = 13
-	},
-/obj/item/transfer_valve{
-	pixel_x = 10;
-	pixel_y = 21
-	},
-/obj/item/transfer_valve{
-	pixel_x = 7;
-	pixel_y = 19
-	},
-/obj/item/transfer_valve{
-	pixel_x = 4;
-	pixel_y = 17
-	},
-/obj/item/pipe_dispenser{
-	pixel_y = 4
-	},
-/turf/open/floor/iron,
-/area/station/science/ordnance/testlab)
 "qiM" = (
 /obj/structure/table,
 /turf/open/floor/iron/cafeteria,
@@ -46649,15 +46560,6 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/grass,
 /area/station/service/hydroponics/garden/monastery)
-"quQ" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/turf/open/floor/tram,
-/area/station/security/tram)
 "quS" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -46921,6 +46823,15 @@
 /obj/structure/table/glass,
 /turf/open/floor/iron/white,
 /area/station/science/research)
+"qzp" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/button/transport/tram/directional/north{
+	specific_transport_id = "bird_1";
+	id = 1
+	},
+/obj/machinery/transport/destination_sign/indicator/directional/north,
+/turf/open/floor/noslip,
+/area/station/security/tram)
 "qzq" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
@@ -47003,6 +46914,12 @@
 /obj/effect/spawner/random/maintenance,
 /turf/open/floor/iron,
 /area/station/maintenance/department/medical/central)
+"qAq" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 5
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "qAs" = (
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/stripes/red/line{
@@ -47234,12 +47151,6 @@
 /obj/structure/sign/poster/contraband/random/directional/north,
 /turf/open/floor/iron/white/small,
 /area/station/maintenance/port/aft)
-"qDD" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "qDK" = (
 /obj/machinery/light_switch/directional/west,
 /obj/structure/reagent_dispensers/water_cooler,
@@ -47527,6 +47438,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/commons/dorms)
+"qIB" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "qID" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -47821,12 +47739,6 @@
 /obj/machinery/light/cold/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
-"qOv" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/fluff/tram_rail/floor,
-/obj/structure/thermoplastic,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "qOG" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -47860,18 +47772,6 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/station/cargo/drone_bay)
-"qOO" = (
-/obj/item/stack/sheet/mineral/titanium,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
-"qOT" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 5
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "qPc" = (
 /obj/effect/turf_decal/tile/green/opposingcorners{
 	dir = 1
@@ -48273,14 +48173,6 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/wood/tile,
 /area/station/command/corporate_showroom)
-"qVz" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "qVK" = (
 /obj/machinery/firealarm/directional/west,
 /obj/effect/turf_decal/stripes/corner{
@@ -48304,10 +48196,6 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/wood,
 /area/station/cargo/boutique)
-"qWd" = (
-/obj/structure/frame/machine,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "qWh" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -48517,6 +48405,11 @@
 /obj/effect/spawner/random/structure/girder,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
+"qYA" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/thermoplastic/light,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "qYD" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron/showroomfloor,
@@ -48595,6 +48488,17 @@
 /obj/structure/broken_flooring/corner/directional/south,
 /turf/open/floor/plating,
 /area/station/hallway/secondary/dock)
+"qZH" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/fluff/tram_rail/floor{
+	dir = 1
+	},
+/obj/structure/thermoplastic,
+/obj/structure/chair/sofa/bench/tram/right{
+	dir = 1
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "qZU" = (
 /obj/machinery/portable_atmospherics/canister/plasma,
 /obj/effect/turf_decal/stripes/white/line{
@@ -48615,6 +48519,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/commons/storage/tools)
+"ral" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/turf/open/floor/tram,
+/area/station/security/tram)
 "ram" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/wood/large,
@@ -48663,6 +48576,14 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/wood/large,
 /area/station/service/hydroponics/garden/monastery)
+"rbc" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/obj/machinery/computer/tram_controls{
+	specific_transport_id = "bird_1"
+	},
+/turf/open/floor/tram,
+/area/station/security/tram)
 "rbh" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/siding/wood{
@@ -49054,6 +48975,14 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth,
 /area/station/cargo/drone_bay)
+"rhy" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/thermoplastic,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "rhD" = (
 /obj/structure/cable,
 /obj/structure/rack,
@@ -49287,15 +49216,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood,
 /area/station/cargo/boutique)
-"rlV" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/obj/structure/frame/computer{
-	dir = 4
-	},
-/turf/open/floor/tram,
-/area/station/security/tram)
 "rma" = (
 /obj/machinery/atmospherics/pipe/smart/simple/general/visible{
 	dir = 6
@@ -49365,6 +49285,13 @@
 /obj/effect/mapping_helpers/mail_sorting/service/library,
 /turf/open/floor/plating,
 /area/station/maintenance/central/greater)
+"rnZ" = (
+/obj/structure/transport/linear/tram,
+/obj/effect/landmark/transport/nav_beacon/tram/nav/birdshot/maint,
+/obj/effect/landmark/transport/nav_beacon/tram/platform/birdshot/maint_left,
+/obj/structure/thermoplastic/light,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "roi" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -49574,12 +49501,6 @@
 	},
 /turf/open/floor/glass,
 /area/station/hallway/secondary/spacebridge)
-"rrB" = (
-/obj/structure/transport/linear/tram,
-/obj/effect/landmark/transport/transport_id/birdshot/line_2,
-/obj/structure/thermoplastic/light,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "rrC" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49685,6 +49606,14 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/plating,
 /area/station/engineering/main)
+"rsQ" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/landmark/navigate_destination/chapel,
+/obj/effect/landmark/transport/nav_beacon/tram/nav/immovable_rod,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
 "rsV" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49752,6 +49681,18 @@
 	},
 /turf/closed/wall,
 /area/station/hallway/secondary/recreation)
+"ruc" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/public/glass{
+	name = "Prison Garden"
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/textured_half{
+	dir = 8
+	},
+/area/station/security/prison/garden)
 "rui" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
@@ -49798,6 +49739,12 @@
 "rvp" = (
 /turf/closed/mineral/random/stationside,
 /area/station/maintenance/hallway/abandoned_command)
+"rvs" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/item/stack/sheet/mineral/titanium,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "rvy" = (
 /obj/effect/mapping_helpers/broken_floor,
 /obj/effect/decal/cleanable/dirt,
@@ -49995,14 +49942,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
-"ryj" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 10
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "ryk" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -50375,6 +50314,12 @@
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/iron/smooth,
 /area/station/cargo/drone_bay)
+"rDY" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "rEb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/generic_maintenance_landmark,
@@ -51187,14 +51132,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/medical/pharmacy,
 /turf/open/floor/iron/dark/small,
 /area/station/medical/pharmacy)
-"rQM" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 5
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "rQN" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/tile/neutral{
@@ -51511,12 +51448,6 @@
 	},
 /turf/open/floor/iron/smooth_large,
 /area/station/science/auxlab/firing_range)
-"rVz" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 10
-	},
-/turf/open/floor/tram,
-/area/station/security/tram)
 "rVH" = (
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /obj/structure/table/glass,
@@ -51756,12 +51687,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/catwalk_floor/flat_white,
 /area/station/science/robotics/augments)
-"rZk" = (
-/obj/structure/chair/comfy/shuttle,
-/obj/structure/transport/linear/tram,
-/obj/structure/thermoplastic,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "rZn" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment,
@@ -52034,13 +51959,6 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical/central)
-"sdC" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/fluff/tram_rail/floor,
-/obj/structure/thermoplastic,
-/obj/structure/chair/sofa/bench/tram/solo,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "sdQ" = (
 /obj/structure/cable,
 /obj/machinery/door/airlock/maintenance{
@@ -52618,6 +52536,14 @@
 /obj/effect/spawner/random/engineering/tracking_beacon,
 /turf/open/floor/iron,
 /area/station/security/courtroom)
+"snB" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/structure/thermoplastic,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "snJ" = (
 /obj/effect/turf_decal/stripes/corner,
 /obj/machinery/light/small/directional/south,
@@ -52669,6 +52595,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/small,
 /area/station/engineering/atmos)
+"sox" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "soD" = (
 /obj/effect/turf_decal/siding/thinplating_new/dark/corner{
 	dir = 8
@@ -53485,6 +53417,12 @@
 /obj/effect/spawner/structure/window/reinforced/tinted,
 /turf/open/floor/plating,
 /area/station/maintenance/central/lesser)
+"sBm" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/fluff/tram_rail/floor,
+/obj/structure/thermoplastic/light,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "sBp" = (
 /obj/structure/table,
 /obj/machinery/processor{
@@ -54052,6 +53990,20 @@
 /obj/structure/closet/secure_closet/security/med,
 /turf/open/floor/iron/smooth,
 /area/station/security/checkpoint/customs/auxiliary)
+"sLS" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/holosign/barrier/atmos/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "sLU" = (
 /obj/structure/cable,
 /obj/effect/spawner/structure/window/reinforced,
@@ -54755,6 +54707,10 @@
 	},
 /turf/open/floor/engine,
 /area/station/science/cytology)
+"sXI" = (
+/obj/structure/frame/machine,
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "sXO" = (
 /obj/structure/chair{
 	dir = 4
@@ -55152,6 +55108,25 @@
 	dir = 1
 	},
 /area/station/security/execution/transfer)
+"teE" = (
+/obj/structure/table,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/item/assembly/timer{
+	pixel_x = -3;
+	pixel_y = 9
+	},
+/obj/item/assembly/timer{
+	pixel_y = 7
+	},
+/obj/machinery/light_switch/directional/south,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/item/holosign_creator/atmos,
+/obj/item/holosign_creator/atmos{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/turf/open/floor/iron,
+/area/station/science/ordnance/testlab)
 "teG" = (
 /obj/structure/chair/sofa/bench{
 	dir = 4
@@ -55240,15 +55215,6 @@
 /obj/item/clipboard,
 /turf/open/floor/iron/white/small,
 /area/station/science/server)
-"tfY" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/fluff/tram_rail/floor{
-	dir = 1
-	},
-/obj/structure/thermoplastic,
-/obj/structure/rack,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "tgj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/easel,
@@ -55524,24 +55490,6 @@
 "tnb" = (
 /turf/open/floor/plating,
 /area/station/maintenance/central/lesser)
-"tno" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = -2;
-	pixel_y = 8
-	},
-/obj/machinery/requests_console/directional/west{
-	department = "Ordnance Test Range";
-	name = "Test Range Requests Console"
-	},
-/obj/effect/mapping_helpers/requests_console/information,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = 3;
-	pixel_y = -2
-	},
-/turf/open/floor/iron,
-/area/station/science/ordnance/testlab)
 "tns" = (
 /obj/effect/mapping_helpers/broken_floor,
 /obj/effect/decal/cleanable/dirt,
@@ -55576,6 +55524,17 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
+"tnA" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/fluff/tram_rail/floor{
+	dir = 1
+	},
+/obj/structure/thermoplastic,
+/obj/structure/chair/sofa/bench/tram/left{
+	dir = 1
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "tnO" = (
 /obj/structure/cable,
 /obj/effect/mapping_helpers/broken_floor,
@@ -55605,6 +55564,17 @@
 	},
 /turf/open/floor/wood/tile,
 /area/station/tcommsat/server)
+"top" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/obj/machinery/computer/tram_controls{
+	specific_transport_id = "bird_2"
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "toA" = (
 /turf/open/floor/iron,
 /area/station/hallway/secondary/recreation)
@@ -56161,6 +56131,12 @@
 /obj/structure/cable,
 /turf/open/floor/plating/rust,
 /area/station/maintenance/fore/greater)
+"twQ" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 9
+	},
+/turf/open/floor/tram,
+/area/station/maintenance/department/medical/central)
 "twR" = (
 /obj/structure/table/glass,
 /obj/machinery/cell_charger,
@@ -56250,6 +56226,13 @@
 /obj/structure/cable,
 /turf/open/floor/iron/smooth,
 /area/station/cargo/drone_bay)
+"tyT" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/thermoplastic,
+/obj/effect/landmark/transport/nav_beacon/tram/platform/birdshot/sec_wing,
+/obj/effect/landmark/transport/nav_beacon/tram/nav/birdshot/prison,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "tyY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/firealarm/directional/south,
@@ -56581,18 +56564,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
-"tDM" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 1;
-	id = "rdordnance";
-	name = "Ordnance Lab Shutters"
-	},
-/turf/open/floor/plating,
-/area/station/science/ordnance)
 "tDP" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -56609,6 +56580,17 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/wood/parquet,
 /area/station/service/theater)
+"tEg" = (
+/obj/structure/transport/linear/tram,
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/obj/structure/fluff/tram_rail/floor{
+	dir = 1
+	},
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "tEj" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 1
@@ -56736,6 +56718,15 @@
 "tGq" = (
 /turf/closed/wall,
 /area/station/service/kitchen/coldroom)
+"tGv" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/button/transport/tram/directional/north{
+	specific_transport_id = "bird_1";
+	id = 2
+	},
+/obj/machinery/transport/destination_sign/indicator/directional/north,
+/turf/open/floor/noslip,
+/area/station/security/tram)
 "tGI" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -57767,6 +57758,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/port/greater)
+"tYM" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/turf/open/floor/tram,
+/area/station/security/tram)
 "tYN" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -58127,14 +58127,6 @@
 	},
 /turf/open/floor/iron/textured_large,
 /area/station/security/brig/entrance)
-"udE" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "udI" = (
 /obj/structure/closet{
 	name = "Evidence Closet 3"
@@ -58264,14 +58256,6 @@
 /obj/effect/turf_decal/trimline/neutral/line,
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
-"ufU" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/transport/nav_beacon/tram/nav/immovable_rod,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
 "ugb" = (
 /obj/effect/turf_decal/tile/yellow/opposingcorners,
 /obj/effect/decal/cleanable/dirt,
@@ -58344,12 +58328,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/science/robotics,
 /turf/open/floor/catwalk_floor/flat_white,
 /area/station/science/robotics/augments)
-"ugY" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 10
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "uhe" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/machinery/conveyor{
@@ -58578,11 +58556,6 @@
 	dir = 1
 	},
 /area/station/science/research)
-"ukT" = (
-/obj/effect/turf_decal/siding/wood,
-/mob/living/basic/syndicate/russian/ranged/lootless,
-/turf/open/floor/wood,
-/area/station/service/abandoned_gambling_den)
 "ukV" = (
 /obj/machinery/computer/security{
 	dir = 8
@@ -58653,6 +58626,13 @@
 	},
 /turf/open/floor/engine,
 /area/station/science/explab)
+"umx" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 9
+	},
+/obj/item/stack/sheet/mineral/titanium,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "umz" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
@@ -58825,11 +58805,6 @@
 	dir = 5
 	},
 /area/station/science/research)
-"upR" = (
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "uqc" = (
 /obj/structure/cable,
 /obj/effect/spawner/random/trash,
@@ -58990,14 +58965,6 @@
 "usJ" = (
 /turf/open/floor/iron/kitchen/small,
 /area/station/maintenance/aft)
-"utg" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/landmark/navigate_destination/chapel,
-/obj/effect/landmark/transport/nav_beacon/tram/nav/immovable_rod,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
 "uth" = (
 /obj/effect/turf_decal/plaque{
 	icon_state = "L2"
@@ -59193,6 +59160,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/greater)
+"uwI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/transport/nav_beacon/tram/nav/immovable_rod,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
 "uwU" = (
 /obj/structure/closet/secure_closet/hydroponics,
 /obj/effect/turf_decal/bot,
@@ -60242,6 +60215,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/maintenance/hallway/abandoned_command)
+"uPw" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/obj/structure/frame/computer{
+	dir = 4
+	},
+/turf/open/floor/tram,
+/area/station/security/tram)
 "uPJ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -60351,13 +60333,6 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/solars/port/aft)
-"uRp" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/obj/item/stack/sheet/mineral/titanium,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "uRF" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -60660,20 +60635,6 @@
 "uWo" = (
 /turf/closed/wall,
 /area/station/medical/paramedic)
-"uWu" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/holosign/barrier/atmos/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "uWv" = (
 /obj/structure/window/reinforced/spawner/directional/east,
 /obj/structure/flora/bush/flowers_pp/style_random,
@@ -61145,14 +61106,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/catwalk_floor/flat_white,
 /area/station/science/robotics/augments)
-"vez" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 10
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/maintenance/port/aft)
 "veA" = (
 /obj/machinery/atmospherics/pipe/smart/simple/green/visible,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -63375,6 +63328,15 @@
 "vMC" = (
 /turf/closed/wall/r_wall,
 /area/station/science/lab)
+"vMF" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/fluff/tram_rail/end{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
 "vMJ" = (
 /obj/structure/disposalpipe/sorting/mail,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -63406,12 +63368,9 @@
 /obj/effect/spawner/random/trash,
 /turf/open/floor/plating,
 /area/station/maintenance/central/greater)
-"vNj" = (
-/obj/effect/turf_decal/stripes/white/corner{
-	dir = 4
-	},
+"vMX" = (
 /obj/effect/turf_decal/stripes/white/line{
-	dir = 1
+	dir = 5
 	},
 /obj/structure/transport/linear/tram,
 /obj/structure/tram,
@@ -64447,12 +64406,6 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron,
 /area/station/construction/mining/aux_base)
-"weV" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/turf/open/floor/tram,
-/area/station/security/tram)
 "wfa" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -64502,12 +64455,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/catwalk_floor/flat_white,
 /area/station/science/research)
-"wfH" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 9
-	},
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "wfP" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security/glass{
@@ -64648,6 +64595,18 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/dock)
+"whF" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 1;
+	id = "rdordnance";
+	name = "Ordnance Lab Shutters"
+	},
+/turf/open/floor/plating,
+/area/station/science/ordnance)
 "whL" = (
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
@@ -65314,6 +65273,13 @@
 	},
 /turf/open/floor/iron/dark/side,
 /area/station/science/xenobiology)
+"wte" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/white/line,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
 "wtm" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/siding/blue{
@@ -65994,10 +65960,6 @@
 /obj/machinery/light_switch/directional/south,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
-"wDu" = (
-/obj/effect/turf_decal/stripes/white/line,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "wDA" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
@@ -66234,13 +66196,6 @@
 /obj/effect/turf_decal/tile/neutral/opposingcorners,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/spacebridge)
-"wHY" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 9
-	},
-/obj/item/stack/sheet/mineral/titanium,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "wIc" = (
 /obj/structure/window/spawner/directional/west,
 /obj/structure/flora/rock/pile/jungle/style_random,
@@ -66639,6 +66594,12 @@
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
+"wNS" = (
+/obj/structure/rack,
+/obj/structure/transport/linear/tram,
+/obj/structure/thermoplastic,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "wNT" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -67735,6 +67696,13 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
+"xcq" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "xcv" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -67962,6 +67930,15 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/cytology)
+"xfy" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/fluff/tram_rail/floor{
+	dir = 1
+	},
+/obj/structure/thermoplastic,
+/obj/structure/rack,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "xfH" = (
 /obj/machinery/portable_atmospherics/canister/air,
 /turf/open/floor/iron,
@@ -68128,6 +68105,18 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/central/greater)
+"xhU" = (
+/obj/structure/flora/bush/large/style_random{
+	pixel_x = -18;
+	pixel_y = -9
+	},
+/obj/structure/flora/bush/flowers_yw/style_random,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/siding/wideplating{
+	dir = 4
+	},
+/turf/open/misc/sandy_dirt,
+/area/station/security/tram)
 "xia" = (
 /turf/closed/wall,
 /area/station/science/cubicle)
@@ -68241,6 +68230,14 @@
 "xjz" = (
 /turf/closed/wall/r_wall,
 /area/station/security/prison/garden)
+"xjE" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "xjG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/radio/intercom/prison/directional/north,
@@ -68534,6 +68531,13 @@
 /obj/effect/turf_decal/delivery/white,
 /turf/open/floor/iron,
 /area/station/cargo/sorting)
+"xnB" = (
+/obj/effect/turf_decal/stripes/white/corner,
+/obj/effect/turf_decal/stripes/white/line,
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "xnC" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -68693,6 +68697,11 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
+"xpV" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/thermoplastic,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "xpY" = (
 /obj/structure/cable,
 /obj/structure/table/reinforced,
@@ -68779,15 +68788,6 @@
 "xqW" = (
 /turf/closed/wall/r_wall,
 /area/station/hallway/primary/starboard)
-"xrh" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/button/transport/tram/directional/north{
-	specific_transport_id = "bird_1";
-	id = 2
-	},
-/obj/machinery/transport/destination_sign/indicator/directional/north,
-/turf/open/floor/noslip,
-/area/station/security/tram)
 "xrk" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/decal/cleanable/dirt,
@@ -69212,6 +69212,14 @@
 /obj/structure/barricade/wooden/crude,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/central)
+"xwJ" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 10
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "xwQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/white/line{
@@ -69684,13 +69692,6 @@
 	},
 /turf/open/floor/iron/small,
 /area/station/hallway/primary/starboard)
-"xDM" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 10
-	},
-/obj/item/stack/sheet/mineral/titanium,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "xDW" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -69852,12 +69853,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
-"xGb" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/structure/transport/linear/tram,
-/obj/structure/tram,
-/turf/open/floor/tram,
-/area/station/security/tram)
 "xGc" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -70367,6 +70362,10 @@
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance)
+"xMM" = (
+/obj/item/stack/sheet/mineral/titanium,
+/turf/open/floor/tram,
+/area/station/security/tram)
 "xMO" = (
 /obj/effect/spawner/random/entertainment/arcade{
 	dir = 1
@@ -71560,6 +71559,18 @@
 /obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/aft)
+"yci" = (
+/obj/effect/turf_decal/stripes/white/corner{
+	dir = 4
+	},
+/obj/structure/transport/linear/tram,
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/obj/structure/fluff/tram_rail/floor,
+/obj/structure/tram,
+/turf/open/floor/tram,
+/area/station/maintenance/port/aft)
 "ycj" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -71579,13 +71590,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/research)
-"ycv" = (
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/white/line,
-/turf/open/floor/tram,
-/area/station/maintenance/department/medical/central)
 "ycC" = (
 /turf/closed/wall/r_wall,
 /area/station/command/bridge)
@@ -72008,10 +72012,6 @@
 /obj/structure/window/spawner/directional/north,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
-"yhE" = (
-/obj/effect/landmark/transport/nav_beacon/tram/nav/immovable_rod,
-/turf/closed/wall,
-/area/station/maintenance/port/aft)
 "yhF" = (
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron,
@@ -84581,12 +84581,12 @@ vKU
 lPO
 vfc
 lzM
-jfX
-cJu
-kKy
-cJu
-uRp
-kef
+iNO
+xcq
+ggh
+xcq
+mXD
+jHI
 ieZ
 rtQ
 aJq
@@ -84838,12 +84838,12 @@ dkI
 dLn
 rxu
 lzM
-ndA
-qWd
-qWd
-dhX
-iyk
-ays
+eDt
+bro
+bro
+xMM
+eQC
+jwZ
 ieZ
 rtQ
 aJq
@@ -85095,12 +85095,12 @@ qBT
 uRJ
 rcg
 lzM
-xDM
-acO
-kLG
-bQz
-rlV
-wHY
+iVq
+hmf
+dpR
+bmT
+uPw
+umx
 ieZ
 rtQ
 aJq
@@ -85623,11 +85623,11 @@ nlV
 toT
 kaI
 tlI
-hUT
+dlx
 uEI
 gxx
 gxx
-oVE
+xhU
 jYv
 nlV
 sGp
@@ -85866,12 +85866,12 @@ mZc
 hXU
 hXU
 aFR
-oaE
-dyn
-dyn
-dyn
-dyn
-qOT
+gFZ
+xjE
+xjE
+xjE
+xjE
+vMX
 aFR
 kGC
 qBi
@@ -85893,12 +85893,12 @@ qBi
 qBi
 ltp
 qBi
-gTC
-weV
-jEX
-weV
-weV
-jYd
+aOX
+awe
+bUO
+awe
+awe
+dEF
 qBi
 xAG
 pGR
@@ -86123,12 +86123,12 @@ ccD
 yap
 lzM
 ezE
-ius
-rZk
-kvb
-kvb
-itv
-xGb
+fXD
+cDt
+xpV
+xpV
+snB
+sox
 aFR
 kGC
 qBi
@@ -86150,12 +86150,12 @@ qBi
 qBi
 ltp
 qBi
-aYO
-fay
-fay
-fay
-fay
-ipn
+pCC
+bjZ
+bjZ
+bjZ
+bjZ
+khl
 qBi
 xAG
 pGR
@@ -86339,7 +86339,7 @@ xRZ
 wAZ
 wXk
 xgN
-utg
+rsQ
 kar
 vnr
 vIh
@@ -86380,39 +86380,39 @@ qXj
 rBE
 lzM
 aFR
-hYz
-gkO
-iRp
-aPe
-kvb
-jUN
-kNA
-uWu
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kNA
-kjn
-quQ
-fay
-fay
-fay
-kye
-fay
-fay
+iVu
+wNS
+fTd
+tyT
+xpV
+rbc
+ral
+sLS
+ral
+ral
+ral
+ral
+ral
+ral
+ral
+ral
+ral
+ral
+ral
+ral
+ral
+ral
+ral
+ral
+ral
+oDY
+tYM
+bjZ
+bjZ
+bjZ
+lqL
+bjZ
+bjZ
 qBi
 iJt
 pGR
@@ -86426,7 +86426,7 @@ eax
 xAG
 jWd
 lGO
-ufU
+cZA
 hyX
 tBm
 tBm
@@ -86637,12 +86637,12 @@ dBr
 eWB
 lzM
 aFR
-vNj
-rZk
-kvb
-kvb
-kSo
-kyS
+mnb
+cDt
+xpV
+xpV
+rhy
+xnB
 aFR
 kGC
 qBi
@@ -86664,12 +86664,12 @@ qBi
 qBi
 ltp
 qBi
-aYO
-fay
-fay
-fay
-fay
-ipn
+pCC
+bjZ
+bjZ
+bjZ
+bjZ
+khl
 qBi
 xAG
 pSd
@@ -86683,7 +86683,7 @@ xAG
 xAG
 uby
 wCX
-lvM
+ruc
 uby
 wCX
 uby
@@ -86894,12 +86894,12 @@ tRE
 vzY
 lzM
 aFR
-ryj
-eTq
-cID
-cID
-eTq
-gXd
+xwJ
+paI
+cZC
+cZC
+paI
+khp
 aFR
 kGC
 qBi
@@ -86921,12 +86921,12 @@ qBi
 qBi
 ltp
 aFR
-rVz
-kLG
-kLG
-kLG
-kLG
-bUo
+dHn
+dpR
+dpR
+dpR
+dpR
+cRW
 qBi
 xAG
 pSd
@@ -87151,7 +87151,7 @@ tRE
 dUD
 lzM
 lzM
-xrh
+tGv
 tpm
 jeh
 jeh
@@ -87178,7 +87178,7 @@ mTQ
 qDO
 lzM
 lzM
-mId
+qzp
 tpm
 jeh
 jeh
@@ -88708,7 +88708,7 @@ trp
 trp
 trp
 trp
-yhE
+akF
 trp
 trp
 trp
@@ -88964,9 +88964,9 @@ xAR
 gqg
 hQE
 xAR
-fos
+keq
 xAR
-fbX
+vMF
 xAR
 xAR
 xAR
@@ -89220,11 +89220,11 @@ trp
 trp
 trp
 trp
-eVe
-pxs
-upR
-jVX
-rQM
+dsU
+aYv
+dmG
+aLv
+dSV
 vJH
 xAR
 trp
@@ -89471,17 +89471,17 @@ xAR
 trp
 kiG
 iVJ
-coH
+boI
 trp
 mPv
 aGU
 wqD
 trp
-qVz
-sdC
-eEl
-qfw
-fuk
+lbG
+oJA
+qYA
+tnA
+rDY
 vJH
 xAR
 trp
@@ -89734,11 +89734,11 @@ sVL
 xul
 knJ
 fAr
-oNM
-qOv
-eEl
-oXh
-fuk
+oOL
+khQ
+qYA
+qZH
+rDY
 vJH
 xAR
 trp
@@ -89991,11 +89991,11 @@ jRx
 knJ
 xul
 mxM
-iaZ
-cSD
-rrB
-tfY
-fuk
+jzg
+sBm
+pdf
+xfy
+rDY
 vJH
 xAR
 trp
@@ -90248,11 +90248,11 @@ xIC
 knJ
 nFu
 mxM
-gTk
-cSD
-jwC
-tfY
-fuk
+kbc
+sBm
+rnZ
+xfy
+rDY
 vJH
 xAR
 trp
@@ -90505,11 +90505,11 @@ gEe
 bbU
 knJ
 fAr
-cwd
-qOv
-eEl
-qfw
-fuk
+top
+khQ
+qYA
+tnA
+rDY
 vJH
 xAR
 trp
@@ -90760,13 +90760,13 @@ vUf
 muI
 vUf
 vAU
-caE
+mNG
 trp
-qVz
-sdC
-eEl
-oXh
-fuk
+lbG
+oJA
+qYA
+qZH
+rDY
 vJH
 xAR
 trp
@@ -91019,11 +91019,11 @@ xul
 edP
 xul
 trp
-vez
-isf
-oGS
-pNT
-dBF
+css
+yci
+gkq
+tEg
+dCs
 trp
 vfi
 trp
@@ -91278,7 +91278,7 @@ xul
 trp
 vJH
 vJH
-iBV
+bRN
 vJH
 vJH
 trp
@@ -91792,7 +91792,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -92049,7 +92049,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -92306,7 +92306,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -92563,7 +92563,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -92820,7 +92820,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -93077,7 +93077,7 @@ blb
 blb
 blb
 blb
-pwG
+wte
 blb
 blb
 blb
@@ -93334,7 +93334,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -93591,7 +93591,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -93848,7 +93848,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -94105,7 +94105,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -94362,7 +94362,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -94619,7 +94619,7 @@ blb
 blb
 blb
 blb
-pwG
+wte
 blb
 blb
 blb
@@ -94876,7 +94876,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -95133,7 +95133,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -95390,7 +95390,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -95647,7 +95647,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -95904,7 +95904,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -96161,7 +96161,7 @@ blb
 blb
 blb
 blb
-pwG
+wte
 blb
 blb
 blb
@@ -96418,7 +96418,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -96675,7 +96675,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -96932,7 +96932,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -97189,7 +97189,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -97446,7 +97446,7 @@ blb
 blb
 blb
 blb
-pwG
+wte
 blb
 blb
 blb
@@ -97703,7 +97703,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -97960,7 +97960,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -98217,7 +98217,7 @@ blb
 dDB
 dDB
 dDB
-pwG
+wte
 dDB
 dDB
 bSo
@@ -98474,7 +98474,7 @@ blb
 sSQ
 lMF
 lMF
-pfY
+nZz
 lMF
 lMF
 sSQ
@@ -98731,7 +98731,7 @@ sSQ
 sSQ
 ulO
 ulO
-ycv
+qIB
 ulO
 ulO
 sSQ
@@ -98986,11 +98986,11 @@ sSQ
 sqV
 nFy
 sSQ
-liU
-fWh
-fqT
-fWh
-kqZ
+goB
+jbt
+pfd
+jbt
+qAq
 sSQ
 rwq
 sSQ
@@ -99241,13 +99241,13 @@ wgL
 tLt
 sSQ
 aTc
-frB
+dZT
 sSQ
-qDD
-pqf
-pqf
-pqf
-wDu
+ndp
+gow
+gow
+gow
+aEa
 ulO
 gpu
 sSQ
@@ -99500,18 +99500,18 @@ sSQ
 liH
 uOw
 eBQ
-qDD
-pqf
-pqf
-pqf
-wDu
+ndp
+gow
+gow
+gow
+aEa
 ulO
 gpu
 sOj
 vTG
-crr
-cuG
-ksL
+pKp
+ksv
+pzN
 sSQ
 dDB
 dDB
@@ -99757,18 +99757,18 @@ sSQ
 ewW
 aTc
 cku
-qDD
-pqf
-pqf
-pqf
-wDu
+ndp
+gow
+gow
+gow
+aEa
 ulO
 gpu
 sOj
 vTG
-ocg
-pqf
-gjr
+mET
+gow
+pje
 sSQ
 dDB
 dDB
@@ -100014,18 +100014,18 @@ pVK
 oZY
 aTc
 cku
-qDD
-pqf
-hmB
-pqf
-wDu
+ndp
+gow
+aCR
+gow
+aEa
 ulO
 gpu
 sOj
 vTG
-udE
-edW
-prT
+pXh
+mdr
+klY
 sSQ
 dDB
 dDB
@@ -100271,18 +100271,18 @@ sSQ
 hia
 ggl
 eBQ
-qDD
-pqf
-pqf
-pqf
-wDu
+ndp
+gow
+gow
+gow
+aEa
 ulO
 gpu
 sOj
 vTG
-pDG
-qOO
-dbO
+aAV
+gSz
+ddq
 sSQ
 dDB
 dDB
@@ -100528,18 +100528,18 @@ sSQ
 fWW
 idW
 sSQ
-qDD
-pqf
-pqf
-pqf
-wDu
+ndp
+gow
+gow
+gow
+aEa
 ulO
 gpu
 sOj
 vTG
-pNm
-eFi
-prT
+igD
+sXI
+klY
 sSQ
 dDB
 dDB
@@ -100785,18 +100785,18 @@ sSQ
 lQZ
 sSQ
 sSQ
-ugY
-gwh
-gwh
-gwh
-wfH
+lTU
+nhx
+nhx
+nhx
+twQ
 ulO
 gpu
 sOj
 vTG
-nJm
-pqf
-prT
+oTI
+gow
+klY
 sSQ
 dDB
 dDB
@@ -101051,9 +101051,9 @@ ulO
 gpu
 sOj
 vTG
-mGQ
-edW
-bFG
+oIK
+mdr
+rvs
 sSQ
 dDB
 dDB
@@ -101308,9 +101308,9 @@ ulO
 gpu
 sOj
 vTG
-dLd
-gwh
-wfH
+gSs
+nhx
+twQ
 sSQ
 blb
 blb
@@ -107725,8 +107725,8 @@ ykn
 vbR
 vbR
 vbR
-hzI
-oBo
+kms
+uwI
 vbR
 vbR
 fnz
@@ -112269,7 +112269,7 @@ jAV
 wOp
 kbE
 vgf
-lJE
+dJz
 nSu
 xXT
 cek
@@ -112523,7 +112523,7 @@ kIL
 lao
 lui
 ssY
-ukT
+hPq
 kbW
 nfS
 uLf
@@ -121305,7 +121305,7 @@ qJr
 qJr
 fky
 lkV
-tDM
+whF
 okW
 kQt
 fUo
@@ -123612,9 +123612,9 @@ rle
 wTJ
 wrv
 ejx
-tno
-qiH
-mmf
+bry
+heT
+teE
 qei
 xwQ
 wCH
diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm
index 3f52e73a71c..a635e7d2ad5 100644
--- a/_maps/shuttles/ruin_caravan_victim.dmm
+++ b/_maps/shuttles/ruin_caravan_victim.dmm
@@ -13,7 +13,7 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/ruin/caravan/freighter1)
 "cu" = (
-/mob/living/basic/syndicate/ranged/smg/space,
+/mob/living/basic/trooper/syndicate/ranged/smg/space,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark/airless,
 /area/shuttle/ruin/caravan/freighter1)
@@ -448,7 +448,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
 	},
-/mob/living/basic/syndicate/ranged/smg/space,
+/mob/living/basic/trooper/syndicate/ranged/smg/space,
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
@@ -458,7 +458,7 @@
 /area/shuttle/ruin/caravan/freighter1)
 "Fu" = (
 /obj/effect/decal/cleanable/blood,
-/mob/living/basic/syndicate/melee/sword/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper,
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
@@ -594,7 +594,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
-/mob/living/basic/syndicate/ranged/smg/space,
+/mob/living/basic/trooper/syndicate/ranged/smg/space,
 /turf/open/floor/iron/airless,
 /area/shuttle/ruin/caravan/freighter1)
 "Ld" = (
diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm
index 898a3204d46..45506825229 100644
--- a/_maps/shuttles/ruin_syndicate_dropship.dmm
+++ b/_maps/shuttles/ruin_syndicate_dropship.dmm
@@ -211,7 +211,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/mob/living/basic/syndicate/ranged/smg/pilot{
+/mob/living/basic/trooper/syndicate/ranged/smg/pilot{
 	environment_smash = 0
 	},
 /turf/open/floor/iron/dark,
diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm
index 8db823566c2..f91d0260d66 100644
--- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm
+++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm
@@ -20,7 +20,7 @@
 	req_access = list("syndicate")
 	},
 /obj/structure/cable,
-/mob/living/basic/syndicate/ranged/smg/pilot{
+/mob/living/basic/trooper/syndicate/ranged/smg/pilot{
 	environment_smash = 0
 	},
 /turf/open/floor/mineral/plastitanium/red,
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
index 4d907da6697..291509a1824 100644
--- a/_maps/shuttles/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship_meta.dmm
@@ -270,7 +270,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
-/mob/living/basic/syndicate/ranged{
+/mob/living/basic/trooper/syndicate/ranged{
 	environment_smash = 0;
 	name = "Syndicate Salvage Worker"
 	},
@@ -1519,7 +1519,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/blood/gibs/old,
-/mob/living/basic/syndicate/melee{
+/mob/living/basic/trooper/syndicate/melee{
 	environment_smash = 0
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -1578,7 +1578,7 @@
 "qc" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
-/mob/living/basic/syndicate/melee{
+/mob/living/basic/trooper/syndicate/melee{
 	environment_smash = 0
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -1598,7 +1598,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/mob/living/basic/syndicate/melee{
+/mob/living/basic/trooper/syndicate/melee{
 	environment_smash = 0
 	},
 /turf/open/floor/iron/dark,
diff --git a/_maps/virtual_domains/syndicate_assault.dmm b/_maps/virtual_domains/syndicate_assault.dmm
index 770f0967404..05014331406 100644
--- a/_maps/virtual_domains/syndicate_assault.dmm
+++ b/_maps/virtual_domains/syndicate_assault.dmm
@@ -41,7 +41,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
-/mob/living/basic/syndicate/ranged/shotgun/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/ranged/shotgun/space/stormtrooper,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "bh" = (
@@ -236,7 +236,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "ip" = (
-/mob/living/basic/syndicate/melee/sword/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper,
 /turf/open/floor/plastic,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "iB" = (
@@ -274,7 +274,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
-/mob/living/basic/syndicate/ranged/smg/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/ranged/smg/space/stormtrooper,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "ja" = (
@@ -293,7 +293,7 @@
 /area/ruin/space/has_grav/powered/virtual_domain)
 "jA" = (
 /obj/structure/cable,
-/mob/living/basic/syndicate/melee/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/melee/space/stormtrooper,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "jJ" = (
@@ -412,7 +412,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "oZ" = (
-/mob/living/basic/syndicate/melee/sword/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper,
 /turf/open/floor/carpet/royalblack,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "pl" = (
@@ -641,7 +641,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "yD" = (
-/mob/living/basic/syndicate/ranged/smg/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/ranged/smg/space/stormtrooper,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "yJ" = (
@@ -692,7 +692,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/mob/living/basic/syndicate/ranged/smg/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/ranged/smg/space/stormtrooper,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "Bm" = (
@@ -738,7 +738,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/mob/living/basic/syndicate/ranged/smg/pilot,
+/mob/living/basic/trooper/syndicate/ranged/smg/pilot,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "CR" = (
@@ -788,7 +788,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "EX" = (
-/mob/living/basic/syndicate/ranged/shotgun/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/ranged/shotgun/space/stormtrooper,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "Fp" = (
@@ -1077,7 +1077,7 @@
 /turf/closed/mineral/random,
 /area/space)
 "QX" = (
-/mob/living/basic/syndicate/ranged/space/stormtrooper,
+/mob/living/basic/trooper/syndicate/ranged/space/stormtrooper,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/virtual_domain)
 "Ra" = (
diff --git a/code/__DEFINES/ai/ai_blackboard.dm b/code/__DEFINES/ai/ai_blackboard.dm
index 9bd23d8cbf9..484b38b0fd1 100644
--- a/code/__DEFINES/ai/ai_blackboard.dm
+++ b/code/__DEFINES/ai/ai_blackboard.dm
@@ -16,6 +16,11 @@
 /// Chance to perform an emote per second
 #define BB_EMOTE_CHANCE "BB_EMOTE_CHANCE"
 
+/// Something the mob will say when calling reinforcements
+#define BB_REINFORCEMENTS_SAY "BB_reinforcements_say"
+/// Something the mob will remote when calling reinforcements
+#define BB_REINFORCEMENTS_EMOTE "BB_reinforcements_emote"
+
 ///Turf we want a mob to move to
 #define BB_TRAVEL_DESTINATION "BB_travel_destination"
 
@@ -122,3 +127,8 @@
 #define BB_EMOTE_SEE "emote_see"
 #define BB_EMOTE_SOUND "emote_sound"
 #define BB_SPEAK_CHANCE "emote_chance"
+
+/// A target that has called this mob for reinforcements
+#define BB_BASIC_MOB_REINFORCEMENT_TARGET "BB_basic_mob_reinforcement_target"
+/// The next time at which this mob can call for reinforcements
+#define BB_BASIC_MOB_REINFORCEMENTS_COOLDOWN "BB_basic_mob_reinforcements_cooldown"
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/call_reinforcements.dm b/code/datums/ai/basic_mobs/basic_subtrees/call_reinforcements.dm
new file mode 100644
index 00000000000..59ff88b4879
--- /dev/null
+++ b/code/datums/ai/basic_mobs/basic_subtrees/call_reinforcements.dm
@@ -0,0 +1,50 @@
+#define REINFORCEMENTS_COOLDOWN (30 SECONDS)
+
+/// Calls all nearby mobs that share a faction to give backup in combat
+/datum/ai_planning_subtree/call_reinforcements
+	/// Blackboard key containing something to say when calling reinforcements (takes precedence over emotes)
+	var/say_key = BB_REINFORCEMENTS_SAY
+	/// Blackboard key containing an emote to perform when calling reinforcements
+	var/emote_key = BB_REINFORCEMENTS_EMOTE
+	/// Reinforcement-calling behavior to use
+	var/call_type = /datum/ai_behavior/call_reinforcements
+
+/datum/ai_planning_subtree/call_reinforcements/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+	. = ..()
+	if (!decide_to_call(controller) || controller.blackboard[BB_BASIC_MOB_REINFORCEMENTS_COOLDOWN] > world.time)
+		return
+
+	var/call_say = controller.blackboard[BB_REINFORCEMENTS_SAY]
+	var/call_emote = controller.blackboard[BB_REINFORCEMENTS_EMOTE]
+
+	if(!isnull(call_say))
+		controller.queue_behavior(/datum/ai_behavior/perform_speech, call_say)
+	else if(!isnull(call_emote))
+		controller.queue_behavior(/datum/ai_behavior/perform_emote, call_emote)
+	else
+		controller.queue_behavior(/datum/ai_behavior/perform_emote, "cries for help!")
+
+	controller.queue_behavior(call_type)
+
+/// Decides when to call reinforcements, can be overridden for alternate behavior
+/datum/ai_planning_subtree/call_reinforcements/proc/decide_to_call(datum/ai_controller/controller)
+	return controller.blackboard_key_exists(BB_BASIC_MOB_CURRENT_TARGET) && istype(controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET], /mob)
+
+/// Call out to all mobs in the specified range for help
+/datum/ai_behavior/call_reinforcements
+	/// Range to call reinforcements from
+	var/reinforcements_range = 15
+
+/datum/ai_behavior/call_reinforcements/perform(seconds_per_tick, datum/ai_controller/controller)
+	. = ..()
+
+	var/mob/pawn_mob = controller.pawn
+	for(var/mob/other_mob in oview(reinforcements_range, pawn_mob))
+		if(pawn_mob.faction_check_atom(other_mob) && !isnull(other_mob.ai_controller))
+			// Add our current target to their retaliate list so that they'll attack our aggressor
+			other_mob.ai_controller.insert_blackboard_key_lazylist(BB_BASIC_MOB_RETALIATE_LIST, controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET])
+			other_mob.ai_controller.set_blackboard_key(BB_BASIC_MOB_REINFORCEMENT_TARGET, pawn_mob)
+
+	controller.set_blackboard_key(BB_BASIC_MOB_REINFORCEMENTS_COOLDOWN, world.time + REINFORCEMENTS_COOLDOWN)
+
+#undef REINFORCEMENTS_COOLDOWN
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/travel_to_point.dm b/code/datums/ai/basic_mobs/basic_subtrees/travel_to_point.dm
index 9ce7cc95c07..0b5e5d4776f 100644
--- a/code/datums/ai/basic_mobs/basic_subtrees/travel_to_point.dm
+++ b/code/datums/ai/basic_mobs/basic_subtrees/travel_to_point.dm
@@ -16,3 +16,6 @@
 
 /datum/ai_planning_subtree/travel_to_point/and_clear_target
 	travel_behaviour = /datum/ai_behavior/travel_towards/stop_on_arrival
+
+/datum/ai_planning_subtree/travel_to_point/and_clear_target/reinforce
+	location_key = BB_BASIC_MOB_REINFORCEMENT_TARGET
diff --git a/code/game/machinery/computer/arcade/orion.dm b/code/game/machinery/computer/arcade/orion.dm
index 3bf880a7582..945cbb5593a 100644
--- a/code/game/machinery/computer/arcade/orion.dm
+++ b/code/game/machinery/computer/arcade/orion.dm
@@ -502,7 +502,7 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events())
 	obj_flags |= EMAGGED
 	return TRUE
 
-/mob/living/basic/syndicate/ranged/smg/orion
+/mob/living/basic/trooper/syndicate/ranged/smg/orion
 	name = "spaceport security"
 	desc = "Premier corporate security forces for all spaceports found along the Orion Trail."
 	faction = list(FACTION_ORION)
diff --git a/code/game/machinery/computer/arcade/orion_event.dm b/code/game/machinery/computer/arcade/orion_event.dm
index ea81b67532d..97590059a52 100644
--- a/code/game/machinery/computer/arcade/orion_event.dm
+++ b/code/game/machinery/computer/arcade/orion_event.dm
@@ -525,7 +525,7 @@
 				game.say("WEEWOO! WEEWOO! Spaceport security en route!")
 				playsound(game, 'sound/items/weeoo1.ogg', 100, FALSE)
 				for(var/i in 1 to 3)
-					var/mob/living/basic/syndicate/ranged/smg/orion/spaceport_security = new(get_turf(game))
+					var/mob/living/basic/trooper/syndicate/ranged/smg/orion/spaceport_security = new(get_turf(game))
 					spaceport_security.ai_controller.set_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET, usr)
 	game.fuel += fuel
 	game.food += food
diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm
index e8289afc5b5..29a63b1bff8 100644
--- a/code/game/objects/structures/spawner.dm
+++ b/code/game/objects/structures/spawner.dm
@@ -77,7 +77,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "syndbeacon"
 	spawn_text = "warps in from"
-	mob_types = list(/mob/living/basic/syndicate/ranged)
+	mob_types = list(/mob/living/basic/trooper/syndicate/ranged)
 	faction = list(ROLE_SYNDICATE)
 	mob_gps_id = "SYN" // syndicate
 	spawner_gps_id = "Hostile Warp Beacon"
diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm
index f195764073e..714e3838e34 100644
--- a/code/modules/events/portal_storm.dm
+++ b/code/modules/events/portal_storm.dm
@@ -8,9 +8,11 @@
 	description = "Syndicate troops pour out of portals."
 
 /datum/round_event/portal_storm/syndicate_shocktroop
-	boss_types = list(/mob/living/basic/syndicate/melee/space/stormtrooper = 2)
-	hostile_types = list(/mob/living/basic/syndicate/melee/space = 8,\
-						/mob/living/basic/syndicate/ranged/space = 2)
+	boss_types = list(/mob/living/basic/trooper/syndicate/melee/space/stormtrooper = 2)
+	hostile_types = list(
+		/mob/living/basic/trooper/syndicate/melee/space = 8,
+		/mob/living/basic/trooper/syndicate/ranged/space = 2,
+	)
 
 /datum/round_event_control/portal_storm_narsie
 	name = "Portal Storm: Constructs"
diff --git a/code/modules/events/shuttle_loan/shuttle_loan_datum.dm b/code/modules/events/shuttle_loan/shuttle_loan_datum.dm
index 550e670f695..97cde21a488 100644
--- a/code/modules/events/shuttle_loan/shuttle_loan_datum.dm
+++ b/code/modules/events/shuttle_loan/shuttle_loan_datum.dm
@@ -88,12 +88,12 @@
 	var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/imports/specialops]
 	pack.generate(pick_n_take(empty_shuttle_turfs))
 
-	spawn_list.Add(/mob/living/basic/syndicate/ranged/infiltrator)
-	spawn_list.Add(/mob/living/basic/syndicate/ranged/infiltrator)
+	spawn_list.Add(/mob/living/basic/trooper/syndicate/ranged/infiltrator)
+	spawn_list.Add(/mob/living/basic/trooper/syndicate/ranged/infiltrator)
 	if(prob(75))
-		spawn_list.Add(/mob/living/basic/syndicate/ranged/infiltrator)
+		spawn_list.Add(/mob/living/basic/trooper/syndicate/ranged/infiltrator)
 	if(prob(50))
-		spawn_list.Add(/mob/living/basic/syndicate/ranged/infiltrator)
+		spawn_list.Add(/mob/living/basic/trooper/syndicate/ranged/infiltrator)
 
 /datum/shuttle_loan_situation/lots_of_bees
 	sender = "CentCom Janitorial Division"
@@ -180,11 +180,11 @@
 	var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/service/party]
 	pack.generate(pick_n_take(empty_shuttle_turfs))
 
-	spawn_list.Add(/mob/living/basic/syndicate/russian)
-	spawn_list.Add(/mob/living/basic/syndicate/russian/ranged) //drops a mateba
+	spawn_list.Add(/mob/living/basic/trooper/russian)
+	spawn_list.Add(/mob/living/basic/trooper/russian/ranged) //drops a mateba
 	spawn_list.Add(/mob/living/basic/bear/russian)
 	if(prob(75))
-		spawn_list.Add(/mob/living/basic/syndicate/russian)
+		spawn_list.Add(/mob/living/basic/trooper/russian)
 	if(prob(50))
 		spawn_list.Add(/mob/living/basic/bear/russian)
 
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm b/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm
index 830fb83c0f3..e06c9bbb036 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm
@@ -124,42 +124,3 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
 	icon_state = "syndie-ship"
 	ambientsounds = list('sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg')
 	area_flags = NOTELEPORT | UNIQUE_AREA
-
-//Special NT NPCs
-
-/mob/living/simple_animal/hostile/nanotrasen/ranged/assault
-	name = "Nanotrasen Assault Officer"
-	desc = "Nanotrasen Assault Officer. Contact CentCom if you saw him on your station. Prepare to die, if you've been found near Syndicate property."
-	ranged = TRUE
-	rapid = 4
-	rapid_fire_delay = 1
-	rapid_melee = 1
-	retreat_distance = 2
-	minimum_distance = 4
-	casingtype = /obj/item/ammo_casing/a223/weak
-	projectilesound = 'sound/weapons/gun/smg/shot.ogg'
-	loot = list(/obj/effect/mob_spawn/corpse/human/nanotrasenassaultsoldier)
-	mob_spawner = /obj/effect/mob_spawn/corpse/human/nanotrasenassaultsoldier
-	held_item = /obj/item/gun/ballistic/automatic/ar
-
-/mob/living/simple_animal/hostile/nanotrasen/elite
-	name = "Nanotrasen Elite Assault Officer"
-	desc = "Pray for your life, syndicate. Run while you can."
-	maxHealth = 150
-	health = 150
-	melee_damage_lower = 13
-	melee_damage_upper = 18
-	ranged = TRUE
-	rapid = 3
-	rapid_fire_delay = 5
-	rapid_melee = 3
-	retreat_distance = 0
-	minimum_distance = 1
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
-	projectiletype = /obj/projectile/beam/laser
-	projectilesound = 'sound/weapons/laser.ogg'
-	loot = list(/obj/effect/gibspawner/human)
-	faction = list(ROLE_DEATHSQUAD)
-	mob_spawner = /obj/effect/mob_spawn/corpse/human/nanotrasenelitesoldier
-	held_item = /obj/item/gun/energy/pulse/carbine/lethal
diff --git a/code/modules/mob/living/basic/syndicate/syndicate_ai.dm b/code/modules/mob/living/basic/syndicate/syndicate_ai.dm
deleted file mode 100644
index b256226f161..00000000000
--- a/code/modules/mob/living/basic/syndicate/syndicate_ai.dm
+++ /dev/null
@@ -1,68 +0,0 @@
-/datum/ai_controller/basic_controller/syndicate
-	blackboard = list(
-		BB_TARGETTING_DATUM = new /datum/targetting_datum/basic,
-		BB_TARGET_MINIMUM_STAT = HARD_CRIT,
-	)
-
-	ai_movement = /datum/ai_movement/basic_avoidance
-	idle_behavior = /datum/idle_behavior/idle_random_walk
-	planning_subtrees = list(
-		/datum/ai_planning_subtree/simple_find_target,
-		/datum/ai_planning_subtree/attack_obstacle_in_path/syndicate,
-		/datum/ai_planning_subtree/basic_melee_attack_subtree,
-	)
-
-/datum/ai_planning_subtree/basic_melee_attack_subtree/syndicate
-	melee_attack_behavior = /datum/ai_behavior/basic_melee_attack/syndicate
-
-/datum/ai_behavior/basic_melee_attack/syndicate
-	action_cooldown = 1.2 SECONDS
-
-/datum/ai_planning_subtree/attack_obstacle_in_path/syndicate
-	attack_behaviour = /datum/ai_behavior/attack_obstructions/syndicate
-
-/datum/ai_behavior/attack_obstructions/syndicate
-	action_cooldown = 1.2 SECONDS
-
-/datum/ai_controller/basic_controller/syndicate/ranged
-	planning_subtrees = list(
-		/datum/ai_planning_subtree/simple_find_target,
-		/datum/ai_planning_subtree/basic_ranged_attack_subtree/syndicate,
-	)
-
-/datum/ai_planning_subtree/basic_ranged_attack_subtree/syndicate
-	ranged_attack_behavior = /datum/ai_behavior/basic_ranged_attack/syndicate
-
-/datum/ai_behavior/basic_ranged_attack/syndicate
-	action_cooldown = 1 SECONDS
-	required_distance = 5
-
-/datum/ai_controller/basic_controller/syndicate/ranged/burst
-	planning_subtrees = list(
-		/datum/ai_planning_subtree/simple_find_target,
-		/datum/ai_planning_subtree/basic_ranged_attack_subtree/syndicate_burst
-	)
-
-/datum/ai_planning_subtree/basic_ranged_attack_subtree/syndicate_burst
-	ranged_attack_behavior = /datum/ai_behavior/basic_ranged_attack/syndicate_burst
-
-/datum/ai_behavior/basic_ranged_attack/syndicate_burst
-	action_cooldown = 3 SECONDS
-
-/datum/ai_controller/basic_controller/syndicate/ranged/shotgunner
-	planning_subtrees = list(
-		/datum/ai_planning_subtree/simple_find_target,
-		/datum/ai_planning_subtree/basic_ranged_attack_subtree/syndicate_shotgun
-	)
-
-/datum/ai_planning_subtree/basic_ranged_attack_subtree/syndicate_shotgun
-	ranged_attack_behavior = /datum/ai_behavior/basic_ranged_attack/syndicate_shotgun
-
-/datum/ai_behavior/basic_ranged_attack/syndicate_shotgun
-	action_cooldown = 3 SECONDS
-	required_distance = 1
-
-/datum/ai_controller/basic_controller/syndicate/viscerator
-	blackboard = list(
-		BB_TARGETTING_DATUM = new /datum/targetting_datum/basic()
-	)
diff --git a/code/modules/mob/living/basic/trooper/nanotrasen.dm b/code/modules/mob/living/basic/trooper/nanotrasen.dm
new file mode 100644
index 00000000000..7dfab5298c2
--- /dev/null
+++ b/code/modules/mob/living/basic/trooper/nanotrasen.dm
@@ -0,0 +1,97 @@
+/// Nanotrasen Private Security forces
+/mob/living/basic/trooper/nanotrasen
+	name = "\improper Nanotrasen Private Security Officer"
+	desc = "An officer of Nanotrasen's private security force. Seems rather unpleased to meet you."
+	speed = 0
+	melee_damage_lower = 10
+	melee_damage_upper = 15
+	faction = list(ROLE_DEATHSQUAD)
+	loot = list(/obj/effect/mob_spawn/corpse/human/nanotrasensoldier)
+	mob_spawner = /obj/effect/mob_spawn/corpse/human/nanotrasensoldier
+
+/// A variant that calls for reinforcements on spotting a target
+/mob/living/basic/trooper/nanotrasen/screaming
+	ai_controller = /datum/ai_controller/basic_controller/trooper/calls_reinforcements
+
+/mob/living/basic/trooper/nanotrasen/ranged
+	ai_controller = /datum/ai_controller/basic_controller/trooper/ranged
+	r_hand = /obj/item/gun/ballistic/automatic/pistol/m1911
+	/// Type of bullet we use
+	var/casingtype = /obj/item/ammo_casing/c45
+	/// Sound to play when firing weapon
+	var/projectilesound = 'sound/weapons/gun/pistol/shot_alt.ogg'
+	/// number of burst shots
+	var/burst_shots
+	/// Time between taking shots
+	var/ranged_cooldown = 1 SECONDS
+
+/mob/living/basic/trooper/nanotrasen/ranged/Initialize(mapload)
+	. = ..()
+	AddComponent(\
+		/datum/component/ranged_attacks,\
+		casing_type = casingtype,\
+		projectile_sound = projectilesound,\
+		cooldown_time = ranged_cooldown,\
+		burst_shots = burst_shots,\
+	)
+
+/mob/living/basic/trooper/nanotrasen/ranged/smg
+	ai_controller = /datum/ai_controller/basic_controller/trooper/ranged/burst
+	casingtype = /obj/item/ammo_casing/c46x30mm
+	projectilesound = 'sound/weapons/gun/smg/shot.ogg'
+	r_hand = /obj/item/gun/ballistic/automatic/wt550
+	burst_shots = 3
+	ranged_cooldown = 3 SECONDS
+
+/mob/living/basic/trooper/nanotrasen/ranged/assault
+	name = "Nanotrasen Assault Officer"
+	desc = "Nanotrasen Assault Officer. Contact CentCom if you saw him on your station. Prepare to die, if you've been found near Syndicate property."
+
+	casingtype = /obj/item/ammo_casing/a223/weak
+	burst_shots = 4
+	ranged_cooldown = 3 SECONDS
+	projectilesound = 'sound/weapons/gun/smg/shot.ogg'
+	r_hand = /obj/item/gun/ballistic/automatic/ar
+	loot = list(/obj/effect/mob_spawn/corpse/human/nanotrasenassaultsoldier)
+	mob_spawner = /obj/effect/mob_spawn/corpse/human/nanotrasenassaultsoldier
+
+/mob/living/basic/trooper/nanotrasen/ranged/elite
+	name = "Nanotrasen Elite Assault Officer"
+	desc = "Pray for your life, syndicate. Run while you can."
+	maxHealth = 150
+	health = 150
+	habitable_atmos = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	unsuitable_cold_damage = 0
+	casingtype = /obj/item/ammo_casing/energy/laser
+	burst_shots = 3
+	projectilesound = 'sound/weapons/laser.ogg'
+	ranged_cooldown = 5 SECONDS
+	faction = list(ROLE_DEATHSQUAD)
+	loot = list(/obj/effect/gibspawner/human)
+	mob_spawner = /obj/effect/mob_spawn/corpse/human/nanotrasenelitesoldier
+	r_hand = /obj/item/gun/energy/pulse/carbine/lethal
+
+/// A more peaceful variant that will only attack when attacked, or when another Nanotrasen officer calls for help.
+/mob/living/basic/trooper/nanotrasen/peaceful
+	desc = "An officer of Nanotrasen's private security force."
+	ai_controller = /datum/ai_controller/basic_controller/trooper/peaceful
+
+/mob/living/basic/trooper/nanotrasen/peaceful/Initialize(mapload)
+	. = ..()
+	var/datum/callback/retaliate_callback = CALLBACK(src, PROC_REF(ai_retaliate_behaviour))
+	AddComponent(/datum/component/ai_retaliate_advanced, retaliate_callback)
+
+/mob/living/basic/trooper/nanotrasen/ranged/smg/peaceful
+	desc = "An officer of Nanotrasen's private security force."
+	ai_controller = /datum/ai_controller/basic_controller/trooper/ranged/burst/peaceful
+
+/mob/living/basic/trooper/nanotrasen/ranged/smg/peaceful/Initialize(mapload)
+	. = ..()
+	var/datum/callback/retaliate_callback = CALLBACK(src, PROC_REF(ai_retaliate_behaviour))
+	AddComponent(/datum/component/ai_retaliate_advanced, retaliate_callback)
+
+/mob/living/basic/trooper/nanotrasen/proc/ai_retaliate_behaviour(mob/living/attacker)
+	if (!istype(attacker))
+		return
+	for (var/mob/living/basic/trooper/nanotrasen/potential_trooper in oview(src, 7))
+		potential_trooper.ai_controller.insert_blackboard_key_lazylist(BB_BASIC_MOB_RETALIATE_LIST, attacker)
diff --git a/code/modules/mob/living/basic/syndicate/russian.dm b/code/modules/mob/living/basic/trooper/russian.dm
similarity index 66%
rename from code/modules/mob/living/basic/syndicate/russian.dm
rename to code/modules/mob/living/basic/trooper/russian.dm
index 2de74b9b4d5..6e5e34d16b9 100644
--- a/code/modules/mob/living/basic/syndicate/russian.dm
+++ b/code/modules/mob/living/basic/trooper/russian.dm
@@ -1,8 +1,5 @@
-/**
- * Russian subtype of Syndicate troops
- * We're a subtype because we are nearly the same mob with a different Faction.
- */
-/mob/living/basic/syndicate/russian
+/// Russian trooper subtype
+/mob/living/basic/trooper/russian
 	name = "Russian Mobster"
 	desc = "For the Motherland!"
 	speed = 0
@@ -11,6 +8,10 @@
 	unsuitable_cold_damage = 1
 	unsuitable_heat_damage = 1
 	faction = list(FACTION_RUSSIAN)
+	attack_verb_continuous = "slashes"
+	attack_verb_simple = "slash"
+	attack_sound = 'sound/weapons/bladeslice.ogg'
+	attack_vis_effect = ATTACK_EFFECT_SLASH
 
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/russian
 	r_hand = /obj/item/knife/kitchen
@@ -19,8 +20,8 @@
 		/obj/item/knife/kitchen,
 	)
 
-/mob/living/basic/syndicate/russian/ranged
-	ai_controller = /datum/ai_controller/basic_controller/syndicate/ranged
+/mob/living/basic/trooper/russian/ranged
+	ai_controller = /datum/ai_controller/basic_controller/trooper/ranged
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/russian/ranged
 	r_hand = /obj/item/gun/ballistic/automatic/pistol
 	loot = list(
@@ -30,9 +31,9 @@
 	var/casingtype = /obj/item/ammo_casing/n762
 	var/projectilesound = 'sound/weapons/gun/revolver/shot.ogg'
 
-/mob/living/basic/syndicate/russian/ranged/Initialize(mapload)
+/mob/living/basic/trooper/russian/ranged/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/ranged_attacks, casing_type = casingtype, projectile_sound = projectilesound, cooldown_time = 1 SECONDS)
 
-/mob/living/basic/syndicate/russian/ranged/lootless
+/mob/living/basic/trooper/russian/ranged/lootless
 	loot = list()
diff --git a/code/modules/mob/living/basic/syndicate/syndicate.dm b/code/modules/mob/living/basic/trooper/syndicate.dm
similarity index 66%
rename from code/modules/mob/living/basic/syndicate/syndicate.dm
rename to code/modules/mob/living/basic/trooper/syndicate.dm
index a4fd0981198..43242649193 100644
--- a/code/modules/mob/living/basic/syndicate/syndicate.dm
+++ b/code/modules/mob/living/basic/trooper/syndicate.dm
@@ -1,45 +1,15 @@
-///////////////Base Mob////////////
-
-/mob/living/basic/syndicate
+/// Syndicate troopers
+/mob/living/basic/trooper/syndicate
 	name = "Syndicate Operative"
 	desc = "Death to Nanotrasen."
-	icon = 'icons/mob/simple/simple_human.dmi'
-	mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
-	sentience_type = SENTIENCE_HUMANOID
-	maxHealth = 100
-	health = 100
-	basic_mob_flags = DEL_ON_DEATH
 	speed = 1.1
 	melee_damage_lower = 10
 	melee_damage_upper = 10
-	attack_verb_continuous = "punches"
-	attack_verb_simple = "punch"
-	attack_sound = 'sound/weapons/punch1.ogg'
-	melee_attack_cooldown = 1.2 SECONDS
-	combat_mode = TRUE
-	unsuitable_atmos_damage = 7.5
-	unsuitable_cold_damage = 7.5
-	unsuitable_heat_damage = 7.5
 	faction = list(ROLE_SYNDICATE)
-	ai_controller = /datum/ai_controller/basic_controller/syndicate
-	/// Loot this mob drops on death.
-	var/loot = list(/obj/effect/mob_spawn/corpse/human/syndicatesoldier)
-	/// Path of the mob spawner we base the mob's visuals off of.
-	var/mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatesoldier
-	/// Path of the right hand held item we give to the mob's visuals.
-	var/r_hand
-	/// Path of the left hand held item we give to the mob's visuals.
-	var/l_hand
+	loot = list(/obj/effect/mob_spawn/corpse/human/syndicatesoldier)
+	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatesoldier
 
-/mob/living/basic/syndicate/Initialize(mapload)
-	. = ..()
-	apply_dynamic_human_appearance(src, mob_spawn_path = mob_spawner, r_hand = r_hand, l_hand = l_hand)
-	if(LAZYLEN(loot))
-		loot = string_list(loot)
-		AddElement(/datum/element/death_drops, loot)
-	AddElement(/datum/element/footstep, footstep_type = FOOTSTEP_MOB_SHOE)
-
-/mob/living/basic/syndicate/space
+/mob/living/basic/trooper/syndicate/space
 	name = "Syndicate Commando"
 	maxHealth = 170
 	health = 170
@@ -48,18 +18,18 @@
 	minimum_survivable_temperature = 0
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatecommando
 
-/mob/living/basic/syndicate/space/Initialize(mapload)
+/mob/living/basic/trooper/syndicate/space/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
 	set_light(4)
 
-/mob/living/basic/syndicate/space/stormtrooper
+/mob/living/basic/trooper/syndicate/space/stormtrooper
 	name = "Syndicate Stormtrooper"
 	maxHealth = 250
 	health = 250
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatestormtrooper
 
-/mob/living/basic/syndicate/melee //dude with a knife and no shields
+/mob/living/basic/trooper/syndicate/melee //dude with a knife and no shields
 	melee_damage_lower = 15
 	melee_damage_upper = 15
 	loot = list(/obj/effect/gibspawner/human)
@@ -70,13 +40,13 @@
 	r_hand = /obj/item/knife/combat/survival
 	var/projectile_deflect_chance = 0
 
-/mob/living/basic/syndicate/melee/bullet_act(obj/projectile/projectile)
+/mob/living/basic/trooper/syndicate/melee/bullet_act(obj/projectile/projectile)
 	if(prob(projectile_deflect_chance))
 		visible_message(span_danger("[src] blocks [projectile] with its shield!"))
 		return BULLET_ACT_BLOCK
 	return ..()
 
-/mob/living/basic/syndicate/melee/space
+/mob/living/basic/trooper/syndicate/melee/space
 	name = "Syndicate Commando"
 	maxHealth = 170
 	health = 170
@@ -84,18 +54,18 @@
 	minimum_survivable_temperature = 0
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatecommando
 
-/mob/living/basic/syndicate/melee/space/Initialize(mapload)
+/mob/living/basic/trooper/syndicate/melee/space/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
 	set_light(4)
 
-/mob/living/basic/syndicate/melee/space/stormtrooper
+/mob/living/basic/trooper/syndicate/melee/space/stormtrooper
 	name = "Syndicate Stormtrooper"
 	maxHealth = 250
 	health = 250
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatestormtrooper
 
-/mob/living/basic/syndicate/melee/sword
+/mob/living/basic/trooper/syndicate/melee/sword
 	melee_damage_lower = 30
 	melee_damage_upper = 30
 	attack_verb_continuous = "slashes"
@@ -109,7 +79,7 @@
 	r_hand = /obj/item/melee/energy/sword/saber/red
 	l_hand = /obj/item/shield/energy
 
-/mob/living/basic/syndicate/melee/sword/space
+/mob/living/basic/trooper/syndicate/melee/sword/space
 	name = "Syndicate Commando"
 	maxHealth = 170
 	health = 170
@@ -118,11 +88,11 @@
 	projectile_deflect_chance = 50
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatecommando
 
-/mob/living/basic/syndicate/melee/sword/space/Initialize(mapload)
+/mob/living/basic/trooper/syndicate/melee/sword/space/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
 
-/mob/living/basic/syndicate/melee/sword/space/stormtrooper
+/mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper
 	name = "Syndicate Stormtrooper"
 	maxHealth = 250
 	health = 250
@@ -131,9 +101,9 @@
 
 ///////////////Guns////////////
 
-/mob/living/basic/syndicate/ranged
+/mob/living/basic/trooper/syndicate/ranged
 	loot = list(/obj/effect/gibspawner/human)
-	ai_controller = /datum/ai_controller/basic_controller/syndicate/ranged
+	ai_controller = /datum/ai_controller/basic_controller/trooper/ranged
 	r_hand = /obj/item/gun/ballistic/automatic/pistol
 	/// Type of bullet we use
 	var/casingtype = /obj/item/ammo_casing/c9mm
@@ -144,7 +114,7 @@
 	/// Time between taking shots
 	var/ranged_cooldown = 1 SECONDS
 
-/mob/living/basic/syndicate/ranged/Initialize(mapload)
+/mob/living/basic/trooper/syndicate/ranged/Initialize(mapload)
 	. = ..()
 	AddComponent(\
 		/datum/component/ranged_attacks,\
@@ -154,11 +124,11 @@
 		burst_shots = burst_shots,\
 	)
 
-/mob/living/basic/syndicate/ranged/infiltrator //shuttle loan event
+/mob/living/basic/trooper/syndicate/ranged/infiltrator //shuttle loan event
 	projectilesound = 'sound/weapons/gun/smg/shot_suppressed.ogg'
 	loot = list(/obj/effect/mob_spawn/corpse/human/syndicatesoldier)
 
-/mob/living/basic/syndicate/ranged/space
+/mob/living/basic/trooper/syndicate/ranged/space
 	name = "Syndicate Commando"
 	maxHealth = 170
 	health = 170
@@ -166,31 +136,31 @@
 	minimum_survivable_temperature = 0
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatecommando
 
-/mob/living/basic/syndicate/ranged/space/Initialize(mapload)
+/mob/living/basic/trooper/syndicate/ranged/space/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
 	set_light(4)
 
-/mob/living/basic/syndicate/ranged/space/stormtrooper
+/mob/living/basic/trooper/syndicate/ranged/space/stormtrooper
 	name = "Syndicate Stormtrooper"
 	maxHealth = 250
 	health = 250
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatestormtrooper
 
-/mob/living/basic/syndicate/ranged/smg
+/mob/living/basic/trooper/syndicate/ranged/smg
 	casingtype = /obj/item/ammo_casing/c45
 	projectilesound = 'sound/weapons/gun/smg/shot.ogg'
-	ai_controller = /datum/ai_controller/basic_controller/syndicate/ranged/burst
+	ai_controller = /datum/ai_controller/basic_controller/trooper/ranged/burst
 	burst_shots = 3
 	ranged_cooldown = 3 SECONDS
 	r_hand = /obj/item/gun/ballistic/automatic/c20r
 
-/mob/living/basic/syndicate/ranged/smg/pilot //caravan ambush ruin
+/mob/living/basic/trooper/syndicate/ranged/smg/pilot //caravan ambush ruin
 	name = "Syndicate Salvage Pilot"
 	loot = list(/obj/effect/mob_spawn/corpse/human/syndicatepilot)
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatepilot
 
-/mob/living/basic/syndicate/ranged/smg/space
+/mob/living/basic/trooper/syndicate/ranged/smg/space
 	name = "Syndicate Commando"
 	maxHealth = 170
 	health = 170
@@ -198,25 +168,25 @@
 	minimum_survivable_temperature = 0
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatecommando
 
-/mob/living/basic/syndicate/ranged/smg/space/Initialize(mapload)
+/mob/living/basic/trooper/syndicate/ranged/smg/space/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
 	set_light(4)
 
-/mob/living/basic/syndicate/ranged/smg/space/stormtrooper
+/mob/living/basic/trooper/syndicate/ranged/smg/space/stormtrooper
 	name = "Syndicate Stormtrooper"
 	maxHealth = 250
 	health = 250
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatestormtrooper
 
-/mob/living/basic/syndicate/ranged/shotgun
+/mob/living/basic/trooper/syndicate/ranged/shotgun
 	casingtype = /obj/item/ammo_casing/shotgun/buckshot //buckshot (up to 72.5 brute) fired in a two-round burst
-	ai_controller = /datum/ai_controller/basic_controller/syndicate/ranged/shotgunner
+	ai_controller = /datum/ai_controller/basic_controller/trooper/ranged/shotgunner
 	ranged_cooldown = 3 SECONDS
 	burst_shots = 2
 	r_hand = /obj/item/gun/ballistic/shotgun/bulldog
 
-/mob/living/basic/syndicate/ranged/shotgun/space
+/mob/living/basic/trooper/syndicate/ranged/shotgun/space
 	name = "Syndicate Commando"
 	maxHealth = 170
 	health = 170
@@ -225,12 +195,12 @@
 	speed = 1
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/syndicatecommando
 
-/mob/living/basic/syndicate/ranged/shotgun/space/Initialize(mapload)
+/mob/living/basic/trooper/syndicate/ranged/shotgun/space/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
 	set_light(4)
 
-/mob/living/basic/syndicate/ranged/shotgun/space/stormtrooper
+/mob/living/basic/trooper/syndicate/ranged/shotgun/space/stormtrooper
 	name = "Syndicate Stormtrooper"
 	maxHealth = 250
 	health = 250
@@ -270,7 +240,7 @@
 	bubble_icon = "syndibot"
 	gold_core_spawnable = HOSTILE_SPAWN
 	death_message = "is smashed into pieces!"
-	ai_controller = /datum/ai_controller/basic_controller/syndicate/viscerator
+	ai_controller = /datum/ai_controller/basic_controller/trooper/viscerator
 
 /mob/living/basic/viscerator/Initialize(mapload)
 	. = ..()
diff --git a/code/modules/mob/living/basic/trooper/trooper.dm b/code/modules/mob/living/basic/trooper/trooper.dm
new file mode 100644
index 00000000000..1886c8fc2ff
--- /dev/null
+++ b/code/modules/mob/living/basic/trooper/trooper.dm
@@ -0,0 +1,36 @@
+/mob/living/basic/trooper
+	icon = 'icons/mob/simple/simple_human.dmi'
+	mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
+	sentience_type = SENTIENCE_HUMANOID
+	maxHealth = 100
+	health = 100
+	basic_mob_flags = DEL_ON_DEATH
+	speed = 1.1
+	melee_damage_lower = 10
+	melee_damage_upper = 10
+	attack_verb_continuous = "punches"
+	attack_verb_simple = "punch"
+	attack_sound = 'sound/weapons/punch1.ogg'
+	melee_attack_cooldown = 1.2 SECONDS
+	combat_mode = TRUE
+	unsuitable_atmos_damage = 7.5
+	unsuitable_cold_damage = 7.5
+	unsuitable_heat_damage = 7.5
+	ai_controller = /datum/ai_controller/basic_controller/trooper
+
+	/// Loot this mob drops on death.
+	var/loot = list(/obj/effect/mob_spawn/corpse/human)
+	/// Path of the mob spawner we base the mob's visuals off of.
+	var/mob_spawner = /obj/effect/mob_spawn/corpse/human
+	/// Path of the right hand held item we give to the mob's visuals.
+	var/r_hand
+	/// Path of the left hand held item we give to the mob's visuals.
+	var/l_hand
+
+/mob/living/basic/trooper/Initialize(mapload)
+	. = ..()
+	apply_dynamic_human_appearance(src, mob_spawn_path = mob_spawner, r_hand = r_hand, l_hand = l_hand)
+	if(LAZYLEN(loot))
+		loot = string_list(loot)
+		AddElement(/datum/element/death_drops, loot)
+	AddElement(/datum/element/footstep, footstep_type = FOOTSTEP_MOB_SHOE)
diff --git a/code/modules/mob/living/basic/trooper/trooper_ai.dm b/code/modules/mob/living/basic/trooper/trooper_ai.dm
new file mode 100644
index 00000000000..3b89807ea62
--- /dev/null
+++ b/code/modules/mob/living/basic/trooper/trooper_ai.dm
@@ -0,0 +1,99 @@
+/datum/ai_controller/basic_controller/trooper
+	blackboard = list(
+		BB_TARGETTING_DATUM = new /datum/targetting_datum/basic,
+		BB_TARGET_MINIMUM_STAT = HARD_CRIT,
+		BB_REINFORCEMENTS_SAY = "411 in progress, requesting backup!"
+	)
+
+	ai_movement = /datum/ai_movement/basic_avoidance
+	idle_behavior = /datum/idle_behavior/idle_random_walk
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/attack_obstacle_in_path/trooper,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree,
+		/datum/ai_planning_subtree/travel_to_point/and_clear_target/reinforce,
+	)
+
+/datum/ai_planning_subtree/basic_melee_attack_subtree/trooper
+	melee_attack_behavior = /datum/ai_behavior/basic_melee_attack
+
+/datum/ai_planning_subtree/attack_obstacle_in_path/trooper
+	attack_behaviour = /datum/ai_behavior/attack_obstructions/trooper
+
+/datum/ai_behavior/attack_obstructions/trooper
+	action_cooldown = 1.2 SECONDS
+
+/datum/ai_controller/basic_controller/trooper/calls_reinforcements
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/call_reinforcements,
+		/datum/ai_planning_subtree/attack_obstacle_in_path/trooper,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree,
+		/datum/ai_planning_subtree/travel_to_point/and_clear_target/reinforce,
+	)
+
+/datum/ai_controller/basic_controller/trooper/peaceful
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/target_retaliate,
+		/datum/ai_planning_subtree/call_reinforcements,
+		/datum/ai_planning_subtree/attack_obstacle_in_path/trooper,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree,
+		/datum/ai_planning_subtree/travel_to_point/and_clear_target/reinforce,
+	)
+
+/datum/ai_controller/basic_controller/trooper/ranged
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/basic_ranged_attack_subtree/trooper,
+		/datum/ai_planning_subtree/travel_to_point/and_clear_target/reinforce,
+	)
+
+/datum/ai_planning_subtree/basic_ranged_attack_subtree/trooper
+	ranged_attack_behavior = /datum/ai_behavior/basic_ranged_attack/trooper
+
+/datum/ai_behavior/basic_ranged_attack/trooper
+	action_cooldown = 1 SECONDS
+	required_distance = 5
+	avoid_friendly_fire = TRUE
+
+/datum/ai_controller/basic_controller/trooper/ranged/burst
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/basic_ranged_attack_subtree/trooper_burst,
+		/datum/ai_planning_subtree/travel_to_point/and_clear_target/reinforce,
+	)
+
+/datum/ai_planning_subtree/basic_ranged_attack_subtree/trooper_burst
+	ranged_attack_behavior = /datum/ai_behavior/basic_ranged_attack/trooper_burst
+
+/datum/ai_behavior/basic_ranged_attack/trooper_burst
+	action_cooldown = 3 SECONDS
+	avoid_friendly_fire = TRUE
+
+/datum/ai_controller/basic_controller/trooper/ranged/burst/peaceful
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/target_retaliate,
+		/datum/ai_planning_subtree/call_reinforcements,
+		/datum/ai_planning_subtree/basic_ranged_attack_subtree/trooper_burst,
+		/datum/ai_planning_subtree/travel_to_point/and_clear_target/reinforce,
+	)
+
+/datum/ai_controller/basic_controller/trooper/ranged/shotgunner
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/basic_ranged_attack_subtree/trooper_shotgun,
+		/datum/ai_planning_subtree/travel_to_point/and_clear_target/reinforce,
+	)
+
+/datum/ai_planning_subtree/basic_ranged_attack_subtree/trooper_shotgun
+	ranged_attack_behavior = /datum/ai_behavior/basic_ranged_attack/trooper_shotgun
+
+/datum/ai_behavior/basic_ranged_attack/trooper_shotgun
+	action_cooldown = 3 SECONDS
+	required_distance = 1
+	avoid_friendly_fire = TRUE
+
+/datum/ai_controller/basic_controller/trooper/viscerator
+	blackboard = list(
+		BB_TARGETTING_DATUM = new /datum/targetting_datum/basic,
+	)
diff --git a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
deleted file mode 100644
index 06c0cbfd22b..00000000000
--- a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
+++ /dev/null
@@ -1,111 +0,0 @@
-/mob/living/simple_animal/hostile/nanotrasen
-	name = "\improper Nanotrasen Private Security Officer"
-	desc = "An officer part of Nanotrasen's private security force, he seems rather unpleased to meet you."
-	icon = 'icons/mob/simple/simple_human.dmi'
-	mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
-	sentience_type = SENTIENCE_HUMANOID
-	speak_chance = 0
-	turns_per_move = 5
-	speed = 0
-	stat_attack = HARD_CRIT
-	robust_searching = 1
-	maxHealth = 100
-	health = 100
-	harm_intent_damage = 5
-	melee_damage_lower = 10
-	melee_damage_upper = 15
-	attack_verb_continuous = "punches"
-	attack_verb_simple = "punch"
-	attack_sound = 'sound/weapons/punch1.ogg'
-	combat_mode = TRUE
-	loot = list(/obj/effect/mob_spawn/corpse/human/nanotrasensoldier)
-	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
-	unsuitable_atmos_damage = 7.5
-	faction = list(ROLE_DEATHSQUAD)
-	check_friendly_fire = TRUE
-	status_flags = CANPUSH
-	del_on_death = TRUE
-	dodging = TRUE
-	footstep_type = FOOTSTEP_MOB_SHOE
-	/// Path of the mob spawner we base the mob's visuals off of.
-	var/mob_spawner = /obj/effect/mob_spawn/corpse/human/nanotrasensoldier
-	/// Path of the held item we give to the mob's visuals.
-	var/held_item
-
-/mob/living/simple_animal/hostile/nanotrasen/Initialize(mapload)
-	. = ..()
-	apply_dynamic_human_appearance(src, mob_spawn_path = mob_spawner, r_hand = held_item)
-
-/mob/living/simple_animal/hostile/nanotrasen/screaming/Aggro()
-	..()
-	summon_backup(15)
-	say("411 in progress, requesting backup!")
-
-/mob/living/simple_animal/hostile/nanotrasen/ranged
-	icon_state = "nanotrasenranged"
-	icon_living = "nanotrasenranged"
-	ranged = 1
-	retreat_distance = 3
-	minimum_distance = 5
-	casingtype = /obj/item/ammo_casing/c45
-	projectilesound = 'sound/weapons/gun/pistol/shot_alt.ogg'
-	held_item = /obj/item/gun/ballistic/automatic/pistol/m1911
-
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg
-	icon_state = "nanotrasenrangedsmg"
-	icon_living = "nanotrasenrangedsmg"
-	rapid = 3
-	casingtype = /obj/item/ammo_casing/c46x30mm
-	projectilesound = 'sound/weapons/gun/smg/shot.ogg'
-	held_item = /obj/item/gun/ballistic/automatic/wt550
-
-
-/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace
-	name = "\improper Nanotrasen Private Security Officer"
-	desc = "An officer part of Nanotrasen's private security force."
-	icon = 'icons/mob/simple/simple_human.dmi'
-	turns_per_move = 5
-	speed = 0
-	stat_attack = HARD_CRIT
-	robust_searching = 1
-	vision_range = 3
-	maxHealth = 100
-	health = 100
-	harm_intent_damage = 5
-	melee_damage_lower = 10
-	melee_damage_upper = 15
-	attack_verb_continuous = "punches"
-	attack_verb_simple = "punch"
-	attack_sound = 'sound/weapons/punch1.ogg'
-	faction = list(FACTION_NANOTRASEN_PRIVATE)
-	mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
-	sentience_type = SENTIENCE_HUMANOID
-	combat_mode = TRUE
-	loot = list(/obj/effect/mob_spawn/corpse/human/nanotrasensoldier)
-	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
-	unsuitable_atmos_damage = 7.5
-	status_flags = CANPUSH
-	search_objects = 1
-	/// Path of the held item we give to the mob's visuals.
-	var/held_item
-
-/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace/Initialize(mapload)
-	. = ..()
-	apply_dynamic_human_appearance(src, mob_spawn_path = /obj/effect/mob_spawn/corpse/human/nanotrasensoldier, r_hand = held_item)
-
-/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace/Aggro()
-	..()
-	summon_backup(15)
-	say("411 in progress, requesting backup!")
-
-/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace/ranged
-	vision_range = 9
-	rapid = 3
-	ranged = 1
-	retreat_distance = 3
-	minimum_distance = 5
-	casingtype = /obj/item/ammo_casing/c46x30mm
-	projectilesound = 'sound/weapons/gun/smg/shot.ogg'
-	loot = list(/obj/item/gun/ballistic/automatic/wt550,
-				/obj/effect/mob_spawn/corpse/human/nanotrasensoldier)
-	held_item = /obj/item/gun/ballistic/automatic/wt550
diff --git a/code/modules/mob_spawn/ghost_roles/space_roles.dm b/code/modules/mob_spawn/ghost_roles/space_roles.dm
index 7b4dba395c1..764d20c9a76 100644
--- a/code/modules/mob_spawn/ghost_roles/space_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/space_roles.dm
@@ -97,7 +97,7 @@
 /obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space/Initialize(mapload)
 	. = ..()
 	if(prob(85)) //only has a 15% chance of existing, otherwise it'll just be a NPC syndie.
-		new /mob/living/basic/syndicate/ranged(get_turf(src))
+		new /mob/living/basic/trooper/syndicate/ranged(get_turf(src))
 		return INITIALIZE_HINT_QDEL
 
 ///battlecruiser stuff
diff --git a/code/modules/procedural_mapping/mapGenerators/syndicate.dm b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
index b9dc00e1364..74d2d153d06 100644
--- a/code/modules/procedural_mapping/mapGenerators/syndicate.dm
+++ b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
@@ -17,10 +17,12 @@
 		/obj/structure/closet/syndicate = 25, /obj/machinery/suit_storage_unit/syndicate = 15)
 
 /datum/map_generator_module/splatter_layer/syndie_mobs
-	spawnableAtoms = list(/mob/living/basic/syndicate = 30, \
-		/mob/living/basic/syndicate/melee = 20, \
-		/mob/living/basic/syndicate/ranged = 20, \
-		/mob/living/basic/viscerator = 30)
+	spawnableAtoms = list(
+		/mob/living/basic/trooper/syndicate = 30,
+		/mob/living/basic/trooper/syndicate/melee = 20,
+		/mob/living/basic/trooper/syndicate/ranged = 20,
+		/mob/living/basic/viscerator = 30
+	)
 	spawnableTurfs = list()
 
 // Generators
diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm
index 808c4bd3b7d..5fce21d244a 100644
--- a/code/modules/unit_tests/simple_animal_freeze.dm
+++ b/code/modules/unit_tests/simple_animal_freeze.dm
@@ -117,12 +117,6 @@
 		/mob/living/simple_animal/hostile/mimic/copy/ranged,
 		/mob/living/simple_animal/hostile/mimic/crate,
 		/mob/living/simple_animal/hostile/mimic/xenobio,
-		/mob/living/simple_animal/hostile/nanotrasen,
-		/mob/living/simple_animal/hostile/nanotrasen/elite,
-		/mob/living/simple_animal/hostile/nanotrasen/ranged,
-		/mob/living/simple_animal/hostile/nanotrasen/ranged/assault,
-		/mob/living/simple_animal/hostile/nanotrasen/ranged/smg,
-		/mob/living/simple_animal/hostile/nanotrasen/screaming,
 		/mob/living/simple_animal/hostile/ooze,
 		/mob/living/simple_animal/hostile/ooze/gelatinous,
 		/mob/living/simple_animal/hostile/ooze/grapes,
@@ -134,8 +128,6 @@
 		/mob/living/simple_animal/hostile/retaliate,
 		/mob/living/simple_animal/hostile/retaliate/goose,
 		/mob/living/simple_animal/hostile/retaliate/goose/vomit,
-		/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace,
-		/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace/ranged,
 		/mob/living/simple_animal/hostile/retaliate/trader,
 		/mob/living/simple_animal/hostile/retaliate/trader/mrbones,
 		/mob/living/simple_animal/hostile/vatbeast,
diff --git a/tgstation.dme b/tgstation.dme
index 117e745709d..f0ecb3ee6ce 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -831,6 +831,7 @@
 #include "code\datums\ai\basic_mobs\basic_ai_behaviors\write_on_paper.dm"
 #include "code\datums\ai\basic_mobs\basic_subtrees\attack_adjacent_target.dm"
 #include "code\datums\ai\basic_mobs\basic_subtrees\attack_obstacle_in_path.dm"
+#include "code\datums\ai\basic_mobs\basic_subtrees\call_reinforcements.dm"
 #include "code\datums\ai\basic_mobs\basic_subtrees\capricious_retaliate.dm"
 #include "code\datums\ai\basic_mobs\basic_subtrees\climb_tree.dm"
 #include "code\datums\ai\basic_mobs\basic_subtrees\find_food.dm"
@@ -4569,9 +4570,11 @@
 #include "code\modules\mob\living\basic\space_fauna\wumborian_fugu\inflation.dm"
 #include "code\modules\mob\living\basic\space_fauna\wumborian_fugu\wumborian_ai.dm"
 #include "code\modules\mob\living\basic\space_fauna\wumborian_fugu\wumborian_fugu.dm"
-#include "code\modules\mob\living\basic\syndicate\russian.dm"
-#include "code\modules\mob\living\basic\syndicate\syndicate.dm"
-#include "code\modules\mob\living\basic\syndicate\syndicate_ai.dm"
+#include "code\modules\mob\living\basic\trooper\nanotrasen.dm"
+#include "code\modules\mob\living\basic\trooper\russian.dm"
+#include "code\modules\mob\living\basic\trooper\syndicate.dm"
+#include "code\modules\mob\living\basic\trooper\trooper.dm"
+#include "code\modules\mob\living\basic\trooper\trooper_ai.dm"
 #include "code\modules\mob\living\basic\vermin\axolotl.dm"
 #include "code\modules\mob\living\basic\vermin\butterfly.dm"
 #include "code\modules\mob\living\basic\vermin\cockroach.dm"
@@ -4764,7 +4767,6 @@
 #include "code\modules\mob\living\simple_animal\hostile\hostile.dm"
 #include "code\modules\mob\living\simple_animal\hostile\illusion.dm"
 #include "code\modules\mob\living\simple_animal\hostile\mimic.dm"
-#include "code\modules\mob\living\simple_animal\hostile\nanotrasen.dm"
 #include "code\modules\mob\living\simple_animal\hostile\ooze.dm"
 #include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
 #include "code\modules\mob\living\simple_animal\hostile\vatbeast.dm"
diff --git a/tools/UpdatePaths/Scripts/78917_simple_to_basic_nanotrasen.txt b/tools/UpdatePaths/Scripts/78917_simple_to_basic_nanotrasen.txt
new file mode 100644
index 00000000000..eff2a7616c9
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/78917_simple_to_basic_nanotrasen.txt
@@ -0,0 +1,6 @@
+/mob/living/basic/syndicate/russian/@SUBTYPES : /mob/living/basic/trooper/russian/@SUBTYPES{@OLD}
+/mob/living/basic/syndicate/@SUBTYPES : /mob/living/basic/trooper/syndicate/@SUBTYPES{@OLD}
+/mob/living/simple_animal/hostile/nanotrasen/elite : /mob/living/basic/trooper/nanotrasen/ranged/elite{@OLD}
+/mob/living/simple_animal/hostile/nanotrasen/@SUBTYPES : /mob/living/basic/trooper/nanotrasen/@SUBTYPES{@OLD}
+/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace : /mob/living/basic/trooper/nanotrasen/peaceful{@OLD}
+/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace/ranged : /mob/living/basic/trooper/nanotrasen/ranged/smg/peaceful{@OLD}
\ No newline at end of file