Refactors syndicate simple animals. (#39531)

_maps/RandomRuins/SpaceRuins/caravanambush.dmm

@@ -473,10 +473,7 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/caravan/freighter3)
 "gT" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/space{
-	environment_smash = 0;
-	name = "Syndicate Salvage Worker"
-	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
 /turf/open/floor/plasteel/airless/floorgrime,
 /area/shuttle/caravan/freighter3)
 "gU" = (
@@ -614,10 +611,7 @@
 /obj/effect/turf_decal/box/white/corners{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper{
-	environment_smash = 0;
-	name = "Syndicate Salvage Leader"
-	},
+/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/stormtrooper,
 /turf/open/floor/plasteel/airless/dark,
 /area/shuttle/caravan/freighter3)
 "hz" = (
@@ -892,10 +886,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/syndicate/ranged/space{
-	environment_smash = 0;
-	name = "Syndicate Salvage Worker"
-	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
 /turf/open/floor/plasteel/airless/floorgrime,
 /area/shuttle/caravan/freighter3)
 "iF" = (

_maps/RandomZLevels/challenge.dmm

@@ -664,9 +664,7 @@
 /turf/open/floor/plasteel/dark,
 /area/awaymission/challenge/end)
 "ce" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/space{
-	name = "Syndicate Officer"
-	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/challenge/end)
 "cf" = (
@@ -707,7 +705,7 @@
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cl" = (
-/mob/living/simple_animal/hostile/syndicate/melee,
+/mob/living/simple_animal/hostile/syndicate/melee/sword,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/challenge/end)
 "cm" = (
@@ -756,7 +754,7 @@
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cu" = (
-/mob/living/simple_animal/hostile/syndicate/melee,
+/mob/living/simple_animal/hostile/syndicate/melee/sword,
 /turf/open/floor/mineral/plastitanium,
 /area/awaymission/challenge/end)
 "cv" = (
@@ -823,7 +821,7 @@
 /turf/open/floor/circuit,
 /area/awaymission/challenge/end)
 "cF" = (
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/challenge/end)
 "cG" = (

_maps/RandomZLevels/research.dmm

@@ -86,7 +86,7 @@
 /turf/closed/wall/r_wall,
 /area/awaymission/research/interior/engineering)
 "as" = (
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/mineral/plastitanium,
 /area/awaymission/research/interior/engineering)
 "at" = (
@@ -232,7 +232,7 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/awaymission/research/interior/engineering)
 "aT" = (
-/mob/living/simple_animal/hostile/syndicate/melee,
+/mob/living/simple_animal/hostile/syndicate/melee/sword,
 /turf/open/floor/plating,
 /area/awaymission/research/interior/engineering)
 "aU" = (
@@ -805,7 +805,7 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plating,
 /area/awaymission/research/interior/maint)
 "cA" = (
@@ -1338,7 +1338,7 @@
 /turf/open/floor/plasteel/stairs,
 /area/awaymission/research/interior/genetics)
 "ec" = (
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plating,
 /area/awaymission/research/interior/maint)
 "ed" = (
@@ -1714,7 +1714,7 @@
 /turf/open/floor/plasteel/whiteyellow,
 /area/awaymission/research/interior)
 "fn" = (
-/mob/living/simple_animal/hostile/syndicate/melee,
+/mob/living/simple_animal/hostile/syndicate/melee/sword,
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior)
 "fo" = (
@@ -2673,7 +2673,7 @@
 /turf/open/floor/plating,
 /area/awaymission/research/interior/maint)
 "if" = (
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plasteel/whitegreen,
 /area/awaymission/research/interior)
 "ig" = (
@@ -3116,7 +3116,7 @@
 	pixel_x = 32;
 	pixel_y = 26
 	},
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plasteel/whitegreen,
 /area/awaymission/research/interior)
 "js" = (
@@ -3235,7 +3235,7 @@
 /turf/open/floor/plasteel/whiteblue,
 /area/awaymission/research/interior/medbay)
 "jP" = (
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plasteel/whiteblue,
 /area/awaymission/research/interior/medbay)
 "jQ" = (

_maps/RandomZLevels/spacebattle.dmm

@@ -667,10 +667,6 @@
 	dir = 2
 	},
 /area/awaymission/spacebattle/cruiser)
-"cX" = (
-/mob/living/simple_animal/hostile/syndicate/melee,
-/turf/open/floor/plasteel,
-/area/awaymission/spacebattle/cruiser)
 "cY" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/end{
 	dir = 1
@@ -1239,10 +1235,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/awaymission/spacebattle/syndicate4)
 "fm" = (
-/mob/living/simple_animal/hostile/syndicate/melee{
-	deathmessage = "\[src] falls limp as they release their grip from the energy weapons, activating their self-destruct function!";
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
-	},
+/mob/living/simple_animal/hostile/syndicate/melee/sword,
 /turf/open/floor/plasteel,
 /area/awaymission/spacebattle/cruiser)
 "fn" = (
@@ -1975,12 +1968,6 @@
 	icon_state = "damaged4"
 	},
 /area/awaymission/spacebattle/cruiser)
-"hR" = (
-/mob/living/simple_animal/hostile/syndicate/ranged{
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/gun/ballistic/automatic/c20r,/obj/item/shield/energy)
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/spacebattle/cruiser)
 "hS" = (
 /obj/machinery/computer/shuttle{
 	dir = 4
@@ -2127,7 +2114,7 @@
 /turf/open/floor/plasteel,
 /area/awaymission/spacebattle/cruiser)
 "it" = (
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plasteel,
 /area/awaymission/spacebattle/cruiser)
 "iu" = (
@@ -2303,10 +2290,7 @@
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
 "jr" = (
-/mob/living/simple_animal/hostile/syndicate/melee/space{
-	deathmessage = "\[src] falls limp as they release their grip from the energy weapons, activating their self-destruct function!";
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando)
-	},
+/mob/living/simple_animal/hostile/syndicate/melee/sword/space,
 /turf/open/floor/plating/airless,
 /area/awaymission/spacebattle/cruiser)
 "js" = (
@@ -2423,10 +2407,7 @@
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
 "jK" = (
-/mob/living/simple_animal/hostile/syndicate/melee{
-	deathmessage = "\[src] falls limp as they release their grip from the energy weapons, activating their self-destruct function!";
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
-	},
+/mob/living/simple_animal/hostile/syndicate/melee/sword,
 /turf/open/floor/plasteel/blue/side{
 	dir = 8
 	},
@@ -2487,9 +2468,7 @@
 /turf/open/floor/plasteel/airless,
 /area/awaymission/spacebattle/cruiser)
 "jU" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/space{
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,/obj/item/gun/ballistic/automatic/c20r)
-	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
 /turf/open/floor/plasteel/airless,
 /area/awaymission/spacebattle/cruiser)
 "jV" = (
@@ -2514,9 +2493,7 @@
 /turf/open/floor/engine,
 /area/awaymission/spacebattle/cruiser)
 "jY" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/space{
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,/obj/item/gun/ballistic/automatic/c20r)
-	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
 /turf/open/floor/plating/airless,
 /area/awaymission/spacebattle/cruiser)
 "jZ" = (
@@ -2624,9 +2601,7 @@
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
 "ku" = (
-/mob/living/simple_animal/hostile/syndicate/ranged{
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/gun/ballistic/automatic/c20r,/obj/item/shield/energy)
-	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plasteel/white,
 /area/awaymission/spacebattle/cruiser)
 "kv" = (
@@ -2689,7 +2664,7 @@
 /obj/item/ammo_casing/c10mm,
 /obj/item/ammo_casing/c10mm,
 /obj/item/ammo_casing/c10mm,
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plasteel/freezer,
 /area/awaymission/spacebattle/cruiser)
 "kH" = (
@@ -25506,7 +25481,7 @@ cc
 cc
 cc
 cc
-cX
+fm
 cM
 cN
 cN
@@ -33450,7 +33425,7 @@ cc
 cc
 cc
 cc
-hR
+it
 cc
 fL
 cn
@@ -36289,7 +36264,7 @@ cc
 gd
 gz
 cc
-hR
+it
 gZ
 bT
 cc
@@ -37054,7 +37029,7 @@ eD
 cc
 eY
 cc
-hR
+it
 ft
 cc
 cc
@@ -51182,7 +51157,7 @@ bM
 bM
 bM
 cm
-hR
+it
 cc
 cc
 cc
@@ -52727,7 +52702,7 @@ cc
 cc
 cc
 cc
-hR
+it
 cc
 cc
 cc

_maps/RandomZLevels/wildwest.dmm

@@ -242,7 +242,7 @@
 	},
 /area/awaymission/wildwest/mines)
 "bf" = (
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plating/ironsand{
 	icon_state = "ironsand1"
 	},
@@ -279,7 +279,7 @@
 /turf/open/floor/wood,
 /area/awaymission/wildwest/mines)
 "bn" = (
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plating,
 /area/awaymission/wildwest/refine)
 "bo" = (
@@ -336,7 +336,7 @@
 	},
 /area/awaymission/wildwest/mines)
 "bz" = (
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plasteel/cafeteria{
 	dir = 5
 	},
@@ -359,7 +359,7 @@
 /turf/open/floor/wood,
 /area/awaymission/wildwest/mines)
 "bE" = (
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/wood,
 /area/awaymission/wildwest/mines)
 "bF" = (
@@ -804,9 +804,7 @@
 /area/awaymission/wildwest/gov)
 "cT" = (
 /obj/effect/decal/remains/human,
-/mob/living/simple_animal/hostile/syndicate/ranged/space{
-	name = "Syndicate Commander"
-	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
 /turf/open/floor/plating,
 /area/awaymission/wildwest/refine)
 "cU" = (
@@ -1310,7 +1308,7 @@
 	},
 /area/awaymission/wildwest/mines)
 "ew" = (
-/mob/living/simple_animal/hostile/syndicate/ranged,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/carpet,
 /area/awaymission/wildwest/mines)
 "ex" = (

_maps/shuttles/ruin_caravan_victim.dmm

@@ -174,10 +174,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/syndicate/ranged/space{
-	environment_smash = 0;
-	name = "Syndicate Salvage Worker"
-	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
 /turf/open/floor/plasteel/airless,
 /area/shuttle/caravan/freighter1)
 "jg" = (
@@ -384,10 +381,7 @@
 /turf/open/floor/plasteel/vault/airless,
 /area/shuttle/caravan/freighter1)
 "uS" = (
-/mob/living/simple_animal/hostile/syndicate/melee/space{
-	environment_smash = 0;
-	name = "Syndicate Salvage Worker"
-	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
 /turf/open/floor/plasteel/vault/airless,
 /area/shuttle/caravan/freighter1)
 "vt" = (
@@ -546,10 +540,7 @@
 /area/shuttle/caravan/freighter1)
 "EI" = (
 /obj/effect/decal/cleanable/blood,
-/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper{
-	environment_smash = 0;
-	name = "Syndicate Salvage Leader"
-	},
+/mob/living/simple_animal/hostile/syndicate/melee/sword/space/stormtrooper,
 /turf/open/floor/plasteel/darkblue/corner{
 	dir = 4;
 	initial_gas_mix = "TEMP=2.7"
@@ -567,10 +558,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/syndicate/ranged/space{
-	environment_smash = 0;
-	name = "Syndicate Salvage Worker"
-	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
 /turf/open/floor/plasteel/yellow/corner{
 	dir = 4;
 	initial_gas_mix = "TEMP=2.7"

_maps/shuttles/ruin_syndicate_dropship.dmm

@@ -328,7 +328,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/syndicate/ranged/pilot{
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot{
 	environment_smash = 0
 	},
 /turf/open/floor/plasteel/dark,

_maps/shuttles/ruin_syndicate_fighter_shiv.dmm

@@ -18,7 +18,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
-/mob/living/simple_animal/hostile/syndicate/ranged/pilot{
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot{
 	environment_smash = 0
 	},
 /turf/open/floor/mineral/plastitanium,

_maps/shuttles/whiteship_meta.dmm

@@ -488,7 +488,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/syndicate{
+/mob/living/simple_animal/hostile/syndicate/ranged{
+	environment_smash = 0;
 	name = "Syndicate Salvage Worker"
 	},
 /turf/open/floor/plating,
@@ -1760,6 +1761,9 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/blood/gibs/old,
+/mob/living/simple_animal/hostile/syndicate/melee{
+	environment_smash = 0
+	},
 /turf/open/floor/plasteel/vault,
 /area/shuttle/abandoned/bridge)
 "cu" = (
@@ -1872,9 +1876,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/mob/living/simple_animal/hostile/syndicate{
-	name = "Syndicate Salvage Worker"
-	},
 /turf/open/floor/plasteel/bar,
 /area/shuttle/abandoned/bar)
 "cC" = (
@@ -2339,8 +2340,8 @@
 	name = "dust"
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
-/mob/living/simple_animal/hostile/syndicate/ranged{
-	name = "Syndicate Salvage Worker"
+/mob/living/simple_animal/hostile/syndicate/melee{
+	environment_smash = 0
 	},
 /turf/open/floor/plasteel/vault,
 /area/shuttle/abandoned/cargo)
@@ -3248,8 +3249,8 @@
 	desc = "A thin layer of dust coating the floor.";
 	name = "dust"
 	},
-/mob/living/simple_animal/hostile/syndicate{
-	name = "Syndicate Salvage Worker"
+/mob/living/simple_animal/hostile/syndicate/melee{
+	environment_smash = 0
 	},
 /turf/open/floor/plasteel/dark,
 /area/shuttle/abandoned/cargo)

code/game/machinery/computer/arcade.dm

@@ -704,7 +704,7 @@
 							say("WEEWOO! WEEWOO! Spaceport security en route!")
 							playsound(src, 'sound/items/weeoo1.ogg', 100, FALSE)
 							for(var/i, i<=3, i++)
-								var/mob/living/simple_animal/hostile/syndicate/ranged/orion/O = new/mob/living/simple_animal/hostile/syndicate/ranged/orion(get_turf(src))
+								var/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion/O = new/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion(get_turf(src))
 								O.target = usr
 
 
@@ -1047,7 +1047,7 @@
 	newgame()
 	obj_flags |= EMAGGED
 
-/mob/living/simple_animal/hostile/syndicate/ranged/orion
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion
 	name = "spaceport security"
 	desc = "Premier corporate security forces for all spaceports found along the Orion Trail."
 	faction = list("orion")

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -1,7 +1,7 @@
 /*
 	CONTENTS
 	LINE 10  - BASE MOB
-	LINE 43  - SWORD AND SHIELD
+	LINE 50  - SWORD AND SHIELD
 	LINE 95  - GUNS
 	LINE 136 - MISC
 */
@@ -47,26 +47,82 @@
 	status_flags = CANPUSH
 	del_on_death = 1
 
-///////////////Sword and shield////////////
+///////////////Melee////////////
+
+/mob/living/simple_animal/hostile/syndicate/space
+	icon_state = "syndicate_space"
+	icon_living = "syndicate_space"
+	name = "Syndicate Commando"
+	maxHealth = 170
+	health = 170
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
+	speed = 1
+	spacewalk = TRUE
+
+/mob/living/simple_animal/hostile/syndicate/space/Initialize()
+	. = ..()
+	set_light(4)
+
+/mob/living/simple_animal/hostile/syndicate/space/stormtrooper
+	icon_state = "syndicate_stormtrooper"
+	icon_living = "syndicate_stormtrooper"
+	name = "Syndicate Stormtrooper"
+	maxHealth = 250
+	health = 250
 
 /mob/living/simple_animal/hostile/syndicate/melee
+	melee_damage_lower = 15
+	melee_damage_upper = 15
+	icon_state = "syndicate_knife"
+	icon_living = "syndicate_knife"
+	loot = list(/obj/effect/gibspawner/human)
+	attacktext = "slashes"
+	attack_sound = 'sound/weapons/bladeslice.ogg'
+	status_flags = 0
+
+/mob/living/simple_animal/hostile/syndicate/melee/space
+	icon_state = "syndicate_space_knife"
+	icon_living = "syndicate_space_knife"
+	name = "Syndicate Commando"
+	maxHealth = 170
+	health = 170
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
+	speed = 1
+	spacewalk = TRUE
+
+/mob/living/simple_animal/hostile/syndicate/melee/space/Initialize()
+	. = ..()
+	set_light(4)
+
+/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper
+	icon_state = "syndicate_stormtrooper_knife"
+	icon_living = "syndicate_stormtrooper_knife"
+	name = "Syndicate Stormtrooper"
+	maxHealth = 250
+	health = 250
+
+/mob/living/simple_animal/hostile/syndicate/melee/sword
 	melee_damage_lower = 30
 	melee_damage_upper = 30
-	icon_state = "syndicatemelee"
-	icon_living = "syndicatemelee"
-	loot = list(/obj/effect/gibspawner/human)
+	icon_state = "syndicate_sword"
+	icon_living = "syndicate_sword"
 	attacktext = "slashes"
 	attack_sound = 'sound/weapons/blade1.ogg'
 	armour_penetration = 35
 	light_color = LIGHT_COLOR_RED
 	status_flags = 0
-	maxHealth = 100
-	health = 100
+	var/obj/effect/light_emitter/red_energy_sword/sord
 
-/mob/living/simple_animal/hostile/syndicate/melee/Initialize()
+/mob/living/simple_animal/hostile/syndicate/melee/sword/Initialize()
 	. = ..()
 	set_light(2)
 
+/mob/living/simple_animal/hostile/syndicate/melee/sword/Destroy()
+	QDEL_NULL(sord)
+	return ..()
+
 /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj)
 	if(!Proj)
 		return
@@ -76,62 +132,52 @@
 		visible_message("<span class='danger'>[src] blocks [Proj] with its shield!</span>")
 		return 0
 
-
-/mob/living/simple_animal/hostile/syndicate/melee/space
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
-	icon_state = "syndicatemeleespace"
-	icon_living = "syndicatemeleespace"
+/mob/living/simple_animal/hostile/syndicate/melee/sword/space
+	icon_state = "syndicate_space_sword"
+	icon_living = "syndicate_space_sword"
 	name = "Syndicate Commando"
 	maxHealth = 170
 	health = 170
-	loot = list(/obj/effect/gibspawner/human)
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
 	speed = 1
-	var/obj/effect/light_emitter/red_energy_sword/sord
 	spacewalk = TRUE
 
-/mob/living/simple_animal/hostile/syndicate/melee/space/Initialize()
+/mob/living/simple_animal/hostile/syndicate/melee/sword/space/Initialize()
 	. = ..()
 	sord = new(src)
 	set_light(4)
 
-/mob/living/simple_animal/hostile/syndicate/melee/space/Destroy()
+/mob/living/simple_animal/hostile/syndicate/melee/sword/space/Destroy()
 	QDEL_NULL(sord)
 	return ..()
 
-/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper
-	icon_state = "syndicatemeleestormtrooper"
-	icon_living = "syndicatemeleestormtrooper"
+/mob/living/simple_animal/hostile/syndicate/melee/sword/space/stormtrooper
+	icon_state = "syndicate_stormtrooper_sword"
+	icon_living = "syndicate_stormtrooper_sword"
 	name = "Syndicate Stormtrooper"
 	maxHealth = 250
 	health = 250
-	loot = list(/obj/effect/gibspawner/human)
 
 ///////////////Guns////////////
 
 /mob/living/simple_animal/hostile/syndicate/ranged
 	ranged = 1
-	rapid = 2
 	retreat_distance = 5
 	minimum_distance = 5
-	icon_state = "syndicateranged"
-	icon_living = "syndicateranged"
-	casingtype = /obj/item/ammo_casing/c45/nostamina
-	projectilesound = 'sound/weapons/gunshot_smg.ogg'
+	icon_state = "syndicate_pistol"
+	icon_living = "syndicate_pistol"
+	casingtype = /obj/item/ammo_casing/c10mm
+	projectilesound = 'sound/weapons/gunshot.ogg'
 	loot = list(/obj/effect/gibspawner/human)
 
-/mob/living/simple_animal/hostile/syndicate/ranged/pilot //caravan ambush ruin
-	name = "Syndicate Salvage Pilot"
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
-
 /mob/living/simple_animal/hostile/syndicate/ranged/infiltrator //shuttle loan event
-	rapid = FALSE
 	projectilesound = 'sound/weapons/gunshot_silenced.ogg'
 	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
 
 /mob/living/simple_animal/hostile/syndicate/ranged/space
-	icon_state = "syndicaterangedspace"
-	icon_living = "syndicaterangedspace"
+	icon_state = "syndicate_space_pistol"
+	icon_living = "syndicate_space_pistol"
 	name = "Syndicate Commando"
 	maxHealth = 170
 	health = 170
@@ -139,23 +185,80 @@
 	minbodytemp = 0
 	speed = 1
 	spacewalk = TRUE
-	loot = list(/obj/effect/gibspawner/human)
 
 /mob/living/simple_animal/hostile/syndicate/ranged/space/Initialize()
 	. = ..()
 	set_light(4)
 
 /mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper
-	icon_state = "syndicaterangedstormtrooper"
-	icon_living = "syndicaterangedstormtrooper"
+	icon_state = "syndicate_stormtrooper_pistol"
+	icon_living = "syndicate_stormtrooper_pistol"
 	name = "Syndicate Stormtrooper"
 	maxHealth = 250
 	health = 250
+
+/mob/living/simple_animal/hostile/syndicate/ranged/smg
+	rapid = 2
+	icon_state = "syndicate_smg"
+	icon_living = "syndicate_smg"
+	casingtype = /obj/item/ammo_casing/c45/nostamina
+	projectilesound = 'sound/weapons/gunshot_smg.ogg'
+
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot //caravan ambush ruin
+	name = "Syndicate Salvage Pilot"
+	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
+
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space
+	icon_state = "syndicate_space_smg"
+	icon_living = "syndicate_space_smg"
+	name = "Syndicate Commando"
+	maxHealth = 170
+	health = 170
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
+	speed = 1
+	spacewalk = TRUE
+
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space/Initialize()
+	. = ..()
+	set_light(4)
+
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space/stormtrooper
+	icon_state = "syndicate_stormtrooper_smg"
+	icon_living = "syndicate_stormtrooper_smg"
+	name = "Syndicate Stormtrooper"
+	maxHealth = 250
+	health = 250
+
+/mob/living/simple_animal/hostile/syndicate/ranged/shotgun
+	rapid = 2
 	rapid_fire_delay = 6
 	minimum_distance = 3
+	icon_state = "syndicate_shotgun"
+	icon_living = "syndicate_shotgun"
 	casingtype = /obj/item/ammo_casing/shotgun/buckshot //buckshot (up to 72.5 brute) fired in a two-round burst
-	projectilesound = 'sound/weapons/gunshot.ogg'
-	loot = list(/obj/effect/gibspawner/human)
+
+/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space
+	icon_state = "syndicate_space_shotgun"
+	icon_living = "syndicate_space_shotgun"
+	name = "Syndicate Commando"
+	maxHealth = 170
+	health = 170
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
+	speed = 1
+	spacewalk = TRUE
+
+/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/Initialize()
+	. = ..()
+	set_light(4)
+
+/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/stormtrooper
+	icon_state = "syndicate_stormtrooper_shotgun"
+	icon_living = "syndicate_stormtrooper_shotgun"
+	name = "Syndicate Stormtrooper"
+	maxHealth = 250
+	health = 250
 
 ///////////////Misc////////////