diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 1fa8545e59df..65bc5fed91d2 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -105,7 +105,6 @@
 /turf/open/floor/pod/dark,
 /area/ship/medical)
 "aR" = (
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/effect/turf_decal/techfloor{
 	dir = 6
@@ -116,6 +115,7 @@
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "aU" = (
@@ -128,13 +128,13 @@
 	},
 /obj/item/stock_parts/cell/high,
 /obj/item/stock_parts/cell/high,
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/power/apc/auto_name/directional/north,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "aX" = (
@@ -168,7 +168,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/firealarm/directional/west,
 /obj/machinery/light_switch{
-	pixel_x = -13;
+	pixel_x = -10;
 	pixel_y = 22
 	},
 /turf/open/floor/holofloor/wood,
@@ -218,7 +218,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/dim/directional/west,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "bS" = (
@@ -267,10 +266,10 @@
 /area/ship/hallway/central)
 "cu" = (
 /obj/docking_port/stationary{
+	dir = 8;
 	dwidth = 5;
-	width = 30;
 	height = 15;
-	dir = 8
+	width = 30
 	},
 /turf/template_noop,
 /area/template_noop)
@@ -344,13 +343,10 @@
 	pixel_y = 16
 	},
 /obj/structure/table/reinforced,
-/obj/item/bodypart/l_arm/robot{
-	pixel_x = -6
-	},
-/obj/item/bodypart/r_arm/robot{
-	pixel_x = 6
-	},
 /obj/item/hemostat,
+/obj/machinery/light/directional/south,
+/obj/item/bodypart/l_arm/robot/surplus,
+/obj/item/bodypart/r_arm/robot/surplus,
 /turf/open/floor/pod/dark,
 /area/ship/medical)
 "dv" = (
@@ -467,7 +463,9 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "em" = (
-/obj/machinery/light/directional/north,
+/obj/machinery/light/directional/north{
+	pixel_x = 1
+	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
@@ -497,13 +495,13 @@
 	dir = 8;
 	id = "Artillery2shutter";
 	name = "Artillery Hatch";
-	pixel_x = 29;
+	pixel_x = 26;
 	pixel_y = -4
 	},
 /obj/machinery/button/shieldwallgen{
 	dir = 8;
 	id = "komodo_starboard";
-	pixel_x = 28;
+	pixel_x = 24;
 	pixel_y = 6
 	},
 /turf/open/floor/plasteel/dark,
@@ -541,7 +539,6 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
-/obj/machinery/firealarm/directional/south,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -557,8 +554,7 @@
 /obj/item/storage/toolbox/infiltrator,
 /obj/machinery/light_switch{
 	dir = 1;
-	pixel_x = -10;
-	pixel_y = -19
+	pixel_y = -23
 	},
 /turf/open/floor/engine,
 /area/ship/bridge)
@@ -587,7 +583,9 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/central)
 "fc" = (
-/obj/machinery/light/directional/north,
+/obj/machinery/light/directional/north{
+	pixel_x = 1
+	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 5
 	},
@@ -679,6 +677,7 @@
 /obj/effect/spawner/lootdrop/costume,
 /obj/item/storage/box/emptysandbags,
 /obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "gp" = (
@@ -686,7 +685,7 @@
 	dir = 8;
 	id = "syndiewarship_armorybay";
 	name = "Weapon Hold";
-	pixel_x = 28;
+	pixel_x = 25;
 	req_access_txt = "3"
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -838,13 +837,13 @@
 /area/ship/hallway/central)
 "hj" = (
 /obj/machinery/turretid{
-	pixel_x = -2;
+	pixel_x = 3;
 	pixel_y = 8
 	},
 /obj/structure/table/reinforced,
 /obj/item/gps{
 	pixel_x = -6;
-	pixel_y = 2
+	pixel_y = -5
 	},
 /obj/machinery/button/door{
 	id = "warshipbridge";
@@ -874,7 +873,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/machinery/light_switch{
-	pixel_x = -10;
+	pixel_x = -8;
 	pixel_y = 26
 	},
 /turf/open/floor/mineral/plastitanium,
@@ -909,6 +908,10 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/clothing/under/syndicate/bloodred/sleepytime,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 22
+	},
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "is" = (
@@ -1003,6 +1006,15 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
+/obj/item/soap/syndie,
+/obj/machinery/firealarm/directional/north{
+	pixel_x = -6;
+	pixel_y = 34
+	},
+/obj/structure/extinguisher_cabinet/directional/north{
+	pixel_x = 9;
+	pixel_y = 33
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "jp" = (
@@ -1068,15 +1080,6 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
-"jE" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
-	id = "warshipbridge";
-	name = "Blast Shutters";
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/bridge)
 "jF" = (
 /obj/structure/railing/corner{
 	dir = 4
@@ -1512,7 +1515,6 @@
 /obj/effect/decal/cleanable/robot_debris/limb,
 /obj/machinery/light/dim/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "on" = (
@@ -1569,6 +1571,7 @@
 	icon_state = "2-4"
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "pA" = (
@@ -1651,7 +1654,8 @@
 	pixel_y = -4
 	},
 /obj/item/desk_flag{
-	pixel_x = -10
+	pixel_x = -13;
+	pixel_y = -4
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -1722,7 +1726,6 @@
 /obj/item/pickaxe,
 /obj/item/mining_scanner,
 /obj/item/mining_scanner,
-/obj/machinery/light/directional/east,
 /obj/structure/closet/wall{
 	dir = 8;
 	icon_door = "orange_wall";
@@ -1738,7 +1741,9 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/directional/south,
+/obj/machinery/airalarm/directional/south{
+	pixel_y = -35
+	},
 /obj/item/storage/box/firingpins{
 	pixel_x = 21
 	},
@@ -1753,6 +1758,9 @@
 	pixel_x = -2;
 	pixel_y = -4
 	},
+/obj/machinery/camera/autoname{
+	dir = 4
+	},
 /turf/open/floor/pod/dark,
 /area/ship/security/armory)
 "qT" = (
@@ -1794,6 +1802,7 @@
 	pixel_x = 6;
 	pixel_y = -3
 	},
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/pod/dark,
 /area/ship/security/armory)
 "ro" = (
@@ -1810,7 +1819,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/airalarm/directional/north,
+/obj/machinery/airalarm/directional/north{
+	pixel_y = 25
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -1820,15 +1831,10 @@
 /obj/effect/turf_decal/trimline/transparent/bar/filled/line{
 	dir = 9
 	},
-/obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/machinery/light_switch{
-	pixel_x = -20;
-	pixel_y = 12;
-	dir = 4
-	},
+/obj/machinery/power/apc/auto_name/directional/west,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "rv" = (
@@ -1866,7 +1872,9 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/syndicateemblem/top/left,
-/obj/machinery/firealarm/directional/west,
+/obj/machinery/firealarm/directional/west{
+	pixel_x = -34
+	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/central)
 "rS" = (
@@ -2017,7 +2025,6 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/effect/turf_decal/techfloor,
 /obj/item/clothing/under/syndicate,
@@ -2025,6 +2032,7 @@
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "tw" = (
@@ -2129,11 +2137,18 @@
 /area/ship/crew/canteen)
 "uB" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/west,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/firealarm/directional/west{
+	pixel_x = -34
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -22;
+	pixel_y = -10
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "uD" = (
@@ -2142,13 +2157,16 @@
 	name = "tactical chair"
 	},
 /obj/machinery/light_switch{
-	pixel_x = -17;
-	pixel_y = 26
+	pixel_x = -11;
+	pixel_y = 24
 	},
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/obj/item/radio/intercom/directional/north,
+/obj/item/radio/intercom/directional/north{
+	pixel_x = 4;
+	pixel_y = 32
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "uF" = (
@@ -2169,11 +2187,13 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/central)
 "uQ" = (
-/obj/machinery/light/directional/south,
 /obj/effect/turf_decal/trimline/transparent/bar/filled/line,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/south{
+	pixel_y = -30
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "uR" = (
@@ -2259,7 +2279,9 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "vw" = (
-/obj/machinery/light/directional/north,
+/obj/machinery/light/directional/north{
+	pixel_x = -1
+	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
@@ -2324,7 +2346,6 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "vQ" = (
-/obj/machinery/light/directional/east,
 /obj/effect/turf_decal/box,
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/button/door{
@@ -2337,11 +2358,19 @@
 	dir = 4
 	},
 /obj/machinery/suit_storage_unit/inherit,
+<<<<<<< HEAD
+/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
+=======
+>>>>>>> f12dc22a42871971e90ca5181da93ebc712493f3
 /obj/machinery/light_switch{
-	pixel_x = -13;
+	pixel_x = -9;
 	pixel_y = 22
 	},
+<<<<<<< HEAD
+/obj/item/tank/internals/emergency_oxygen/empty,
+=======
 /obj/item/clothing/suit/space/hardsuit/syndi/hl,
+>>>>>>> f12dc22a42871971e90ca5181da93ebc712493f3
 /obj/item/clothing/mask/gas/syndicate,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
@@ -2574,7 +2603,8 @@
 /obj/machinery/button/door{
 	id = "Syndie_warship_lockdown";
 	name = "Lockdown Control";
-	pixel_y = 26
+	pixel_x = 4;
+	pixel_y = 24
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -2591,6 +2621,10 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/machinery/light_switch{
+	pixel_x = -7;
+	pixel_y = 23
+	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/central)
 "zF" = (
@@ -2625,7 +2659,6 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/effect/turf_decal/techfloor,
 /obj/item/clothing/mask/balaclava,
@@ -2634,6 +2667,7 @@
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "zV" = (
@@ -2666,9 +2700,9 @@
 "Al" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters{
+	dir = 8;
 	id = "warshipbridge";
-	name = "Blast Shutters";
-	dir = 8
+	name = "Blast Shutters"
 	},
 /turf/open/floor/plating,
 /area/ship/bridge)
@@ -2781,11 +2815,11 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/trimline/transparent/bar/filled/line,
-/obj/machinery/airalarm/directional/south,
 /obj/effect/decal/cleanable/vomit/old{
 	pixel_x = 9;
 	pixel_y = -1
 	},
+/obj/machinery/light/directional/south,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "Bg" = (
@@ -2851,14 +2885,10 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/machinery/light_switch{
-	pixel_x = -13;
-	pixel_y = 22
-	},
+/obj/machinery/power/apc/auto_name/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "BW" = (
@@ -2869,14 +2899,14 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light_switch{
 	pixel_x = -10;
-	pixel_y = 26
+	pixel_y = 24
 	},
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
 /obj/item/radio/intercom/directional/north{
-	pixel_y = 31;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 32
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
@@ -3009,7 +3039,6 @@
 /area/ship/engineering)
 "CZ" = (
 /obj/machinery/computer/bsa_control,
-/obj/machinery/firealarm/directional/east,
 /turf/open/floor/circuit/green/off,
 /area/ship/maintenance/starboard)
 "Dd" = (
@@ -3025,11 +3054,14 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/obj/item/radio/intercom/directional/west,
+/obj/item/radio/intercom/directional/west{
+	pixel_x = -32;
+	pixel_y = -3
+	},
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_x = -23;
-	pixel_y = 13
+	pixel_x = -22;
+	pixel_y = 11
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -3051,7 +3083,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm)
 "DO" = (
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -3065,6 +3096,7 @@
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "DQ" = (
@@ -3146,9 +3178,15 @@
 	},
 /obj/item/clothing/under/syndicate/combat,
 /obj/item/clothing/under/syndicate/aclf,
+<<<<<<< HEAD
+/obj/item/clothing/suit/armor/vest/security/hos{
+	icon_state = "armor_hosjacket";
+	name = "Syndicate jacket"
+	},
+=======
+>>>>>>> f12dc22a42871971e90ca5181da93ebc712493f3
 /obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
 /obj/item/clothing/gloves/krav_maga/combatglovesplus,
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/glasses/thermal/eyepatch,
 /obj/item/clothing/head/HoS/beret/syndicate,
 /obj/item/clothing/head/HoS/syndicate,
@@ -3162,6 +3200,7 @@
 /obj/item/ammo_box/a357,
 /obj/item/ammo_box/a357,
 /obj/item/radio/headset/syndicate/alt/leader,
+/obj/item/clothing/shoes/combat,
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "El" = (
@@ -3268,7 +3307,10 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 22
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Fg" = (
@@ -3333,6 +3375,7 @@
 /obj/effect/decal/cleanable/shreds{
 	pixel_y = 14
 	},
+/obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "FY" = (
@@ -3383,7 +3426,9 @@
 /obj/structure/railing{
 	dir = 9
 	},
-/obj/machinery/firealarm/directional/north,
+/obj/machinery/firealarm/directional/west{
+	pixel_y = 5
+	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/central)
 "Hc" = (
@@ -3421,7 +3466,9 @@
 /obj/effect/decal/cleanable/robot_debris,
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/turf_decal/borderfloorblack,
-/obj/machinery/airalarm/directional/east,
+/obj/machinery/airalarm/directional/east{
+	pixel_x = 30
+	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -3486,7 +3533,9 @@
 /obj/machinery/camera/autoname{
 	dir = 1
 	},
-/obj/machinery/firealarm/directional/south,
+/obj/machinery/firealarm/directional/south{
+	pixel_y = -34
+	},
 /obj/structure/railing{
 	dir = 5
 	},
@@ -3514,13 +3563,13 @@
 /area/ship/cargo)
 "HN" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/box/bodybags{
-	pixel_y = 6
-	},
 /obj/item/stack/medical/gauze,
-/obj/item/stack/medical/ointment,
+/obj/item/stack/medical/ointment{
+	pixel_x = 10;
+	pixel_y = -11
+	},
 /obj/item/stack/medical/bruise_pack{
-	pixel_x = 6
+	pixel_x = 9
 	},
 /obj/structure/window/reinforced{
 	dir = 1
@@ -3533,7 +3582,7 @@
 	},
 /obj/item/storage/firstaid/fire{
 	pixel_x = -7;
-	pixel_y = -3
+	pixel_y = -6
 	},
 /turf/open/floor/pod/dark,
 /area/ship/medical)
@@ -3656,6 +3705,7 @@
 "Io" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/plating/rust,
 /area/ship/maintenance/starboard)
 "Iv" = (
@@ -3670,6 +3720,7 @@
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "IE" = (
@@ -3690,27 +3741,15 @@
 /area/ship/hallway/central)
 "IL" = (
 /obj/structure/table/reinforced,
-/obj/machinery/light/directional/east,
-/obj/item/paper_bin{
-	pixel_x = 6
-	},
-/obj/item/pen/red{
-	pixel_x = 5;
-	pixel_y = 1
-	},
-/obj/effect/turf_decal/techfloor{
-	dir = 4
-	},
-/obj/item/clipboard{
-	pixel_x = -5
-	},
-/obj/item/taperecorder{
-	pixel_x = -3
-	},
-/obj/item/clothing/glasses/hud/security/night{
+/obj/item/toy/figure/syndie{
 	pixel_x = -4;
-	pixel_y = -6
+	pixel_y = 5
+	},
+/obj/machinery/fax{
+	pixel_x = 4;
+	pixel_y = 0
 	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Jo" = (
@@ -3739,7 +3778,6 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Jw" = (
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/neck/scarf/red,
 /obj/item/clothing/mask/bandana/skull,
 /obj/item/clothing/mask/gas/syndicate,
@@ -3754,6 +3792,7 @@
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "Jx" = (
@@ -3807,13 +3846,20 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/suit_storage_unit/inherit,
+<<<<<<< HEAD
+/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
+/obj/item/tank/internals/emergency_oxygen/empty,
+=======
 /obj/item/clothing/suit/space/hardsuit/syndi/hl,
+>>>>>>> f12dc22a42871971e90ca5181da93ebc712493f3
 /obj/item/clothing/mask/gas/syndicate,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
 "JH" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/firealarm/directional/west,
+/obj/machinery/firealarm/directional/west{
+	pixel_x = -34
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -3926,9 +3972,9 @@
 /area/ship/hallway/central)
 "Lt" = (
 /obj/machinery/door/airlock/hatch{
+	dir = 4;
 	name = "Captain's Office";
-	req_access_txt = "20";
-	dir = 4
+	req_access_txt = "20"
 	},
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel/dark,
@@ -3998,7 +4044,6 @@
 /obj/machinery/chem_dispenser/drinks/beer/fullupgrade,
 /obj/structure/table/reinforced,
 /obj/machinery/light/directional/north,
-/obj/machinery/firealarm/directional/north,
 /obj/machinery/vending/boozeomat/syndicate_access{
 	pixel_x = 32
 	},
@@ -4095,9 +4140,9 @@
 	},
 /obj/machinery/firealarm/directional/east,
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/mask/breath,
 /obj/item/clothing/suit/space/syndicate/black/med,
 /obj/item/clothing/head/helmet/space/syndicate/black/med,
+/obj/item/clothing/mask/gas/syndicate,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/medical)
 "MX" = (
@@ -4371,14 +4416,19 @@
 /obj/machinery/suit_storage_unit/inherit,
 /obj/effect/turf_decal/box,
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/extinguisher_cabinet/directional/north,
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
+<<<<<<< HEAD
+/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
+/obj/machinery/light/directional/east,
+/obj/item/tank/internals/emergency_oxygen/empty,
+=======
 /obj/machinery/camera/autoname{
 	dir = 8
 	},
 /obj/item/clothing/suit/space/hardsuit/syndi/hl,
+>>>>>>> f12dc22a42871971e90ca5181da93ebc712493f3
 /obj/item/clothing/mask/gas/syndicate,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
@@ -4452,6 +4502,7 @@
 	pixel_x = 32
 	},
 /obj/structure/closet/crate/freezer/blood,
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/pod/dark,
 /area/ship/medical)
 "Rp" = (
@@ -4474,6 +4525,7 @@
 	pixel_x = -5;
 	pixel_y = 12
 	},
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "RB" = (
@@ -4496,7 +4548,9 @@
 	dir = 2;
 	name = "tactical chair"
 	},
-/obj/machinery/light/directional/north,
+/obj/machinery/light/directional/north{
+	pixel_x = 2
+	},
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 4
 	},
@@ -4507,7 +4561,9 @@
 	dir = 2;
 	name = "tactical chair"
 	},
-/obj/machinery/light/directional/north,
+/obj/machinery/light/directional/north{
+	pixel_x = -2
+	},
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 1
 	},
@@ -4608,7 +4664,9 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
-/obj/machinery/airalarm/directional/west,
+/obj/machinery/airalarm/directional/west{
+	pixel_x = -29
+	},
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -4856,9 +4914,8 @@
 /area/ship/medical)
 "Vj" = (
 /obj/structure/table/optable,
-/obj/machinery/light/directional/south,
 /obj/machinery/defibrillator_mount/loaded{
-	pixel_y = -26
+	pixel_y = -28
 	},
 /turf/open/floor/pod/dark,
 /area/ship/medical)
@@ -4897,7 +4954,10 @@
 	name = "tactical swivel chair"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/firealarm/directional/south,
+/obj/machinery/firealarm/directional/south{
+	pixel_x = 3;
+	pixel_y = -36
+	},
 /obj/machinery/light_switch{
 	dir = 1;
 	pixel_x = -8;
@@ -4985,7 +5045,7 @@
 /obj/machinery/button/shieldwallgen{
 	dir = 4;
 	id = "komodo_cargo";
-	pixel_x = -24;
+	pixel_x = -23;
 	pixel_y = -10
 	},
 /turf/open/floor/pod,
@@ -5016,21 +5076,29 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/machinery/light_switch{
-	pixel_x = -13;
-	pixel_y = 22
-	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/central)
 "WA" = (
 /obj/structure/table/reinforced,
-/obj/item/toy/figure/syndie{
-	pixel_x = -4;
-	pixel_y = 5
+/obj/item/paper_bin{
+	pixel_x = 6
 	},
-/obj/machinery/fax{
-	pixel_x = 4;
-	pixel_y = 0
+/obj/item/pen/red{
+	pixel_x = 5;
+	pixel_y = 1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/item/clipboard{
+	pixel_x = -5
+	},
+/obj/item/taperecorder{
+	pixel_x = -3
+	},
+/obj/item/clothing/glasses/hud/security/night{
+	pixel_x = -4;
+	pixel_y = -6
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -5089,7 +5157,10 @@
 /obj/machinery/camera/autoname{
 	dir = 9
 	},
-/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/extinguisher_cabinet/directional/east{
+	pixel_x = 30;
+	pixel_y = 2
+	},
 /turf/open/floor/pod,
 /area/ship/cargo)
 "WZ" = (
@@ -5163,29 +5234,34 @@
 "XC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/directional/east,
-/obj/machinery/airalarm/directional/east,
 /obj/structure/table/reinforced,
-/obj/item/clipboard,
+/obj/item/clipboard{
+	pixel_x = -4
+	},
+/obj/item/reagent_containers/hypospray/medipen/pumpup{
+	pixel_x = -1;
+	pixel_y = -12
+	},
+/obj/item/storage/box/bodybags{
+	pixel_x = 9;
+	pixel_y = 9
+	},
+/obj/item/reagent_containers/hypospray/medipen/pumpup{
+	pixel_x = 3;
+	pixel_y = -10
+	},
 /obj/item/reagent_containers/hypospray/medipen{
-	pixel_y = 6
+	pixel_y = -6
 	},
 /obj/item/reagent_containers/hypospray/medipen,
 /obj/item/reagent_containers/hypospray/medipen{
-	pixel_y = -6
+	pixel_y = 6
 	},
 /obj/item/reagent_containers/glass/bottle/charcoal,
 /obj/item/reagent_containers/glass/bottle/formaldehyde{
 	pixel_x = 4;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/hypospray/medipen/pumpup{
-	pixel_x = -1;
-	pixel_y = -12
-	},
-/obj/item/reagent_containers/hypospray/medipen/pumpup{
-	pixel_x = 3;
-	pixel_y = -10
-	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/medical)
 "XE" = (
@@ -5241,7 +5317,14 @@
 "Yv" = (
 /obj/machinery/chem_dispenser/drinks/fullupgrade,
 /obj/structure/table/reinforced,
-/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/firealarm/directional/west{
+	pixel_x = -33
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -21;
+	pixel_y = -11
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "Yw" = (
@@ -5334,7 +5417,9 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 10
 	},
-/obj/machinery/firealarm/directional/south,
+/obj/machinery/firealarm/directional/south{
+	pixel_y = -34
+	},
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
@@ -5380,7 +5465,10 @@
 "ZS" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/firealarm/directional/east,
+/obj/machinery/firealarm/directional/east{
+	pixel_x = 33;
+	pixel_y = 3
+	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -5613,7 +5701,7 @@ CM
 (6,1,1) = {"
 CM
 CM
-jE
+zF
 tC
 tC
 tC
@@ -5699,7 +5787,7 @@ cV
 CM
 "}
 (8,1,1) = {"
-jE
+zF
 si
 nQ
 pS
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 78e7eb8dde74..a495b1dce657 100644
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -90,6 +90,71 @@
 	glasses = /obj/item/clothing/glasses/sunglasses
 	alt_suit = null
 
+/datum/outfit/job/captain/syndicate
+	name = "Captain (ACLF)"
+	id = /obj/item/card/id/syndicate_command/captain_id
+	ears = /obj/item/radio/headset/syndicate/alt/captain
+	uniform = /obj/item/clothing/under/syndicate/aclf
+	shoes = /obj/item/clothing/shoes/combat
+	head = /obj/item/clothing/head/HoS/syndicate
+	gloves = /obj/item/clothing/gloves/combat
+	suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
+
+	backpack = /obj/item/storage/backpack/security
+	satchel = /obj/item/storage/backpack/satchel/sec
+	duffelbag = /obj/item/storage/backpack/duffelbag/sec
+	courierbag = /obj/item/storage/backpack/messenger/sec
+
+/datum/outfit/job/captain/syndicate/sbc
+	name = "Captain (Twinkleshine)"
+
+	uniform = /obj/item/clothing/under/syndicate/aclf
+	gloves = /obj/item/clothing/gloves/combat
+	shoes = /obj/item/clothing/shoes/combat
+	ears = /obj/item/radio/headset/syndicate/alt/captain
+	mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
+	l_pocket = /obj/item/melee/transforming/energy/sword/saber/red
+	suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
+	suit_store = /obj/item/gun/ballistic/revolver/mateba
+	r_pocket = /obj/item/kitchen/knife/combat/survival
+	belt = /obj/item/storage/belt/military/assault
+	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
+	id = /obj/item/card/id/syndicate_command/captain_id
+	implants = list(/obj/item/implant/weapons_auth)
+	backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/pda/captain)
+
+	backpack = /obj/item/storage/backpack/security
+	satchel = /obj/item/storage/backpack/satchel/sec
+	duffelbag = /obj/item/storage/backpack/duffelbag/syndie
+	courierbag = /obj/item/storage/backpack/messenger/sec
+
+	box = /obj/item/storage/box/survival/syndie
+
+/datum/outfit/job/captain/syndicate/sbc/post_equip(mob/living/carbon/human/H)
+	H.faction |= list("PlayerSyndicate")
+
+	var/obj/item/card/id/I = H.wear_id
+	I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(9, 12)) // squidquest real
+	I.access = get_all_accesses()+get_all_syndicate_access()
+	I.update_label()
+
+/datum/outfit/job/captain/syndicate/gorlex
+	name = "Captain (Gorlex Marauders)"
+
+	uniform = /obj/item/clothing/under/syndicate/aclf
+	shoes = /obj/item/clothing/shoes/combat
+	head = /obj/item/clothing/head/aclfcap
+	suit = /obj/item/clothing/suit/aclf
+
+/datum/outfit/job/captain/syndicate/cybersun
+	name = "Cybersun Commander"
+
+	uniform = /obj/item/clothing/under/suit/black_really
+	shoes = /obj/item/clothing/shoes/combat
+	head = /obj/item/clothing/head/HoS/syndicate
+	gloves = /obj/item/clothing/gloves/combat
+	suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
+
 /datum/outfit/job/captain/minutemen
 	name = "Captain (Colonial Minutemen)"