Ported syndicates over to hostile simple animals.

Replaced the old syndicates in the new ones in all the away missions.

Removed a now unused "issyndicate" proc.

Ported the obstacle smashing over to hostile animals. This means carp will attempt to break into escape and stuff now. Scary! (I can make this syndicate only again if it becomes a problem)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5177 316c924e-a436-60f5-8080-3fe189b3f50e

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

@@ -9,6 +9,7 @@
 	var/projectilesound
 	var/casingtype
 	var/target //used for shooting
+	var/incombat = 0 //if they're attacking stuff
 
 /mob/living/simple_animal/hostile/proc/FindTarget()
 
@@ -94,15 +95,24 @@
 		return 0
 	if(client)
 		return 0
+
+	if(incombat)
+		for(dir in list(NORTH,EAST,SOUTH,WEST))
+			var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
+			if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
+				obstacle.attack_animal(src)
 	if(!stat)
 		switch(stance)
 			if(HOSTILE_STANCE_IDLE)
+				incombat = 0
 				target_mob = FindTarget()
 
 			if(HOSTILE_STANCE_ATTACK)
+				incombat = 1
 				MoveToTarget()
 
 			if(HOSTILE_STANCE_ATTACKING)
+				incombat = 1
 				AttackTarget()
 
 
@@ -116,15 +126,15 @@
 		spawn(1)
 			Shoot(tturf, src.loc, src)
 			if(casingtype)
-				new casingtype
+				new casingtype(get_turf(src))
 		spawn(4)
 			Shoot(tturf, src.loc, src)
 			if(casingtype)
-				new casingtype
+				new casingtype(get_turf(src))
 		spawn(6)
 			Shoot(tturf, src.loc, src)
 			if(casingtype)
-				new casingtype
+				new casingtype(get_turf(src))
 	else
 		Shoot(tturf, src.loc, src)
 		if(casingtype)

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

@@ -0,0 +1,132 @@
+/mob/living/simple_animal/hostile/syndicate
+	name = "Syndicate Operative"
+	desc = "Death to Nanotrasen."
+	icon_state = "syndicate"
+	icon_living = "syndicate"
+	icon_dead = "syndicate_dead"
+	icon_gib = "syndicate_gib"
+	speak_chance = 0
+	turns_per_move = 5
+	response_help = "pokes the"
+	response_disarm = "shoves the"
+	response_harm = "hits the"
+	speed = -1
+	stop_automated_movement_when_pulled = 0
+	maxHealth = 100
+	health = 100
+	harm_intent_damage = 5
+	melee_damage_lower = 10
+	melee_damage_upper = 10
+	attacktext = "punches"
+	a_intent = "harm"
+	var/corpse = /obj/effect/landmark/mobcorpse/syndicatesoldier
+	var/weapon1
+	var/weapon2
+	min_oxy = 5
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 1
+	min_co2 = 0
+	max_co2 = 5
+	min_n2 = 0
+	max_n2 = 0
+	unsuitable_atoms_damage = 15
+	wall_smash = 1
+	faction = "syndicate"
+
+///////////////Sword and shield////////////
+
+/mob/living/simple_animal/hostile/syndicate/melee
+	melee_damage_lower = 20
+	melee_damage_upper = 25
+	icon_state = "syndicatemelee"
+	icon_living = "syndicatemelee"
+	weapon1 = /obj/item/weapon/melee/energy/sword/red
+	weapon2 = /obj/item/weapon/shield/energy
+	attacktext = "slashes"
+	status_flags = CANSTUN|CANWEAKEN|CANPARALYSE
+
+/mob/living/simple_animal/hostile/syndicate/melee/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(O.force)
+		if(prob(80))
+			var/damage = O.force
+			if (O.damtype == HALLOSS)
+				damage = 0
+			health -= damage
+			visible_message("\red \b [src] has been attacked with the [O] by [user]. ")
+		else
+			visible_message("\red \b [src] blocks the [O] with its shield! ")
+	else
+		usr << "\red This weapon is ineffective, it does no damage."
+		visible_message("\red [user] gently taps [src] with the [O]. ")
+
+
+/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj)
+	if(!Proj)	return
+	if(prob(65))
+		src.health -= Proj.damage
+	else
+		visible_message("\red <B>[src] blocks [Proj] with its shield!</B>")
+	return 0
+
+
+/mob/living/simple_animal/hostile/syndicate/melee/space
+	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"
+	name = "Syndicate Commando"
+	corpse = /obj/effect/landmark/mobcorpse/syndicatecommando
+	speed = 0
+
+/mob/living/simple_animal/hostile/syndicate/melee/space/Process_Spacemove(var/check_drift = 0)
+	return
+
+/mob/living/simple_animal/hostile/syndicate/ranged
+	ranged = 1
+	rapid = 1
+	icon_state = "syndicateranged"
+	icon_living = "syndicateranged"
+	casingtype = /obj/item/ammo_casing/a12mm
+	projectilesound = 'sound/weapons/Gunshot_smg.ogg'
+	projectiletype = /obj/item/projectile/bullet/midbullet2
+
+	weapon1 = /obj/item/weapon/gun/projectile/automatic/c20r
+
+/mob/living/simple_animal/hostile/syndicate/ranged/space
+	icon_state = "syndicaterangedpsace"
+	icon_living = "syndicaterangedpsace"
+	name = "Syndicate Commando"
+	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
+	corpse = /obj/effect/landmark/mobcorpse/syndicatecommando
+	speed = 0
+
+/mob/living/simple_animal/hostile/syndicate/ranged/space/Process_Spacemove(var/check_drift = 0)
+	return
+
+
+/mob/living/simple_animal/hostile/syndicate/Life()
+	..()
+	if(stat == 2)
+		new corpse (src.loc)
+		if(weapon1)
+			new weapon1 (src.loc)
+		if(weapon2)
+			new weapon2 (src.loc)
+		del src
+		return

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

@@ -1,300 +0,0 @@
-#define SYNDICATE_STANCE_IDLE 1
-#define SYNDICATE_STANCE_ATTACK 2
-#define SYNDICATE_STANCE_ATTACKING 3
-
-/mob/living/simple_animal/syndicate
-	name = "Syndicate Operative"
-	desc = "Death to Nanotrasen."
-	icon_state = "syndicate"
-	icon_living = "syndicate"
-	icon_dead = "syndicate_dead"
-	icon_gib = "syndicate_gib"
-	speak_chance = 0
-	turns_per_move = 5
-	response_help = "pokes the"
-	response_disarm = "shoves the"
-	response_harm = "hits the"
-	speed = -1
-	stop_automated_movement_when_pulled = 0
-	maxHealth = 100
-	health = 100
-	var/ranged = 0
-	var/target
-	var/rapid = 0
-	harm_intent_damage = 5
-	melee_damage_lower = 10
-	melee_damage_upper = 10
-	attacktext = "punches"
-	a_intent = "harm"
-	var/corpse = /obj/effect/landmark/mobcorpse/syndicatesoldier
-	var/weapon1
-	var/weapon2
-	min_oxy = 5
-	max_oxy = 0
-	min_tox = 0
-	max_tox = 1
-	min_co2 = 0
-	max_co2 = 5
-	min_n2 = 0
-	max_n2 = 0
-	unsuitable_atoms_damage = 15
-	wall_smash = 1
-
-	var/stance = SYNDICATE_STANCE_IDLE	//Used to determine behavior
-	var/mob/living/target_mob
-	var/hostile = 0
-
-/mob/living/simple_animal/syndicate/Life()
-	..()
-	if(stat == 2)
-		new corpse (src.loc)
-		if(weapon1)
-			new weapon1 (src.loc)
-		if(weapon2)
-			new weapon2 (src.loc)
-		del src
-		return
-	if(hostile)
-		for(dir in list(NORTH,EAST,SOUTH,WEST))
-			var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
-			if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
-				obstacle.attack_animal(src)
-
-	if(health < 1)
-		Die()
-
-	if(health > maxHealth)
-		health = maxHealth
-
-	if(!ckey && !stop_automated_movement)
-		if(isturf(src.loc) && !resting && !buckled && canmove)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
-			turns_since_move++
-			if(turns_since_move >= turns_per_move)
-				if(!(stop_automated_movement_when_pulled && pulledby))
-					Move(get_step(src,pick(cardinal)))
-					turns_since_move = 0
-
-	if(!stat)
-		switch(stance)
-			if(SYNDICATE_STANCE_IDLE)
-				hostile = 0
-				stop_automated_movement = 0
-
-				for(var/atom/A in view(7,src))
-					if(isSyndicate(A))
-						continue
-
-					if(isliving(A))
-						var/mob/living/L = A
-						if(!L.stat)
-							stance = SYNDICATE_STANCE_ATTACK
-							target_mob = L
-							break
-
-					if(istype(A, /obj/mecha))
-						var/obj/mecha/M = A
-						if (M.occupant)
-							stance = SYNDICATE_STANCE_ATTACK
-							target_mob = M
-							break
-
-			if(SYNDICATE_STANCE_ATTACK)	//This one should only be active for one tick
-				stop_automated_movement = 1
-				hostile = 1
-				if(!target_mob || SA_attackable(target_mob))
-					stance = SYNDICATE_STANCE_IDLE
-				if(target_mob in view(10, src))
-					if(ranged)
-						if(get_dist(src, target_mob) <= 6)
-							OpenFire(target_mob)
-						else
-							walk_to(src, target_mob, 1, 2)
-					else
-						walk_to(src, target_mob, 1, 2)
-						stance = SYNDICATE_STANCE_ATTACKING
-
-			if(SYNDICATE_STANCE_ATTACKING)
-				stop_automated_movement = 1
-				hostile = 1
-				if(!target_mob || SA_attackable(target_mob))
-					stance = SYNDICATE_STANCE_IDLE
-					target_mob = null
-					return
-				if(!(target_mob in view(10, src)))
-					stance = SYNDICATE_STANCE_IDLE
-					target_mob = null
-					return
-				if(get_dist(src, target_mob) <= 1)	//Attacking
-					if(isliving(target_mob))
-						var/mob/living/L = target_mob
-						L.attack_animal(src)
-					if(istype(target_mob,/obj/mecha))
-						var/obj/mecha/M = target_mob
-						M.attack_animal(src)
-
-/mob/living/simple_animal/syndicate/proc/OpenFire(target_mob)
-	src.target = target_mob
-	visible_message("\red <b>[src]</b> fires at [src.target]!", 1)
-
-	var/tturf = get_turf(target)
-	if(rapid)
-		spawn(1)
-			Shoot(tturf, src.loc, src)
-			new /obj/item/ammo_casing/a12mm(get_turf(src))
-		spawn(4)
-			Shoot(tturf, src.loc, src)
-			new /obj/item/ammo_casing/a12mm(get_turf(src))
-		spawn(6)
-			Shoot(tturf, src.loc, src)
-			new /obj/item/ammo_casing/a12mm(get_turf(src))
-	else
-		Shoot(tturf, src.loc, src)
-		new /obj/item/ammo_casing/a12mm(get_turf(src))
-
-	stance = SYNDICATE_STANCE_IDLE
-	target_mob = null
-	return
-
-
-/mob/living/simple_animal/syndicate/proc/Shoot(var/target, var/start, var/user, var/bullet = 0)
-	if(target == start)
-		return
-
-	var/obj/item/projectile/bullet/midbullet2/A = new /obj/item/projectile/bullet/midbullet2(user:loc)
-	playsound(user, 'sound/weapons/Gunshot_smg.ogg', 100, 1)
-	if(!A)	return
-
-	if (!istype(target, /turf))
-		del(A)
-		return
-	A.current = target
-	A.yo = target:y - start:y
-	A.xo = target:x - start:x
-	spawn( 0 )
-		A.process()
-	return
-
-
-
-///////////////Sword and shield////////////
-
-/mob/living/simple_animal/syndicate/melee
-	melee_damage_lower = 20
-	melee_damage_upper = 25
-	icon_state = "syndicatemelee"
-	icon_living = "syndicatemelee"
-	weapon1 = /obj/item/weapon/melee/energy/sword/red
-	weapon2 = /obj/item/weapon/shield/energy
-	attacktext = "slashes"
-	status_flags = CANSTUN|CANWEAKEN|CANPARALYSE
-
-/mob/living/simple_animal/syndicate/melee/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if(O.force)
-		if(prob(80))
-			var/damage = O.force
-			if (O.damtype == HALLOSS)
-				damage = 0
-			health -= damage
-			visible_message("\red \b [src] has been attacked with the [O] by [user]. ")
-		else
-			visible_message("\red \b [src] blocks the [O] with its shield! ")
-	else
-		usr << "\red This weapon is ineffective, it does no damage."
-		visible_message("\red [user] gently taps [src] with the [O]. ")
-
-
-/mob/living/simple_animal/syndicate/melee/bullet_act(var/obj/item/projectile/Proj)
-	if(!Proj)	return
-	if(prob(65))
-		src.health -= Proj.damage
-	else
-		visible_message("\red <B>[src] blocks [Proj] with its shield!</B>")
-	return 0
-
-
-/mob/living/simple_animal/syndicate/melee/space
-	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"
-	name = "Syndicate Commando"
-	corpse = /obj/effect/landmark/mobcorpse/syndicatecommando
-	speed = 0
-
-/mob/living/simple_animal/syndicate/melee/space/Process_Spacemove(var/check_drift = 0)
-	return
-
-/mob/living/simple_animal/syndicate/ranged
-	ranged = 1
-	rapid = 1
-	icon_state = "syndicateranged"
-	icon_living = "syndicateranged"
-	weapon1 = /obj/item/weapon/gun/projectile/automatic/c20r
-
-/mob/living/simple_animal/syndicate/ranged/space
-	icon_state = "syndicaterangedpsace"
-	icon_living = "syndicaterangedpsace"
-	name = "Syndicate Commando"
-	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
-	corpse = /obj/effect/landmark/mobcorpse/syndicatecommando
-	speed = 0
-
-/mob/living/simple_animal/syndicate/ranged/space/Process_Spacemove(var/check_drift = 0)
-	return
-
-
-
-
-
-
-
-
-/mob/living/simple_animal/syndicate/Bump(atom/movable/AM as mob|obj, yes)
-	spawn( 0 )
-		if ((!( yes ) || now_pushing))
-			return
-		now_pushing = 1
-		if(ismob(AM))
-			var/mob/tmob = AM
-			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
-				if(prob(5))
-					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
-					now_pushing = 0
-					return
-			if(!(tmob.status_flags & CANPUSH))
-				now_pushing = 0
-				return
-
-			tmob.LAssailant = src
-		now_pushing = 0
-		..()
-		if (!( istype(AM, /atom/movable) ))
-			return
-		if (!( now_pushing ))
-			now_pushing = 1
-			if (!( AM.anchored ))
-				var/t = get_dir(src, AM)
-				if (istype(AM, /obj/structure/window))
-					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
-						for(var/obj/structure/window/win in get_step(AM,t))
-							now_pushing = 0
-							return
-				step(AM, t)
-			now_pushing = null
-		return
-	return

code/modules/mob/mob_helpers.dm

@@ -75,11 +75,6 @@
 		return 1
 	return 0
 
-/proc/isSyndicate(A)
-	if(istype(A, /mob/living/simple_animal/syndicate))
-		return 1
-	return 0
-
 /proc/isclown(A)
 	if(istype(A, /mob/living/simple_animal/clown))
 		return 1

maps/RandomZLevels/challenge.dmm

@@ -21,7 +21,7 @@
 "au" = (/turf/simulated/wall,/area/awaymission/challenge/start)
 "av" = (/turf/simulated/floor/airless{icon_state = "damaged4"},/area/awaymission/challenge/start)
 "aw" = (/obj/item/stack/rods,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor/airless{icon_state = "damaged2"},/area/awaymission/challenge/start)
-"ax" = (/obj/effect/decal/cleanable/oil,/mob/living/simple_animal/syndicate,/turf/simulated/floor/plating,/area/awaymission/challenge/start)
+"ax" = (/obj/effect/decal/cleanable/oil,/mob/living/simple_animal/hostile/syndicate,/turf/simulated/floor/plating,/area/awaymission/challenge/start)
 "ay" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/airless,/area/awaymission/challenge/start)
 "az" = (/obj/item/clothing/suit/space/syndicate/black,/obj/item/clothing/head/helmet/space/syndicate/black,/turf/simulated/floor/airless{icon_state = "damaged2"},/area/awaymission/challenge/start)
 "aA" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/awaymission/challenge/main)
@@ -106,14 +106,14 @@
 "cb" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/challenge/end)
 "cc" = (/obj/structure/stool/bed/chair{dir = 1},/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
 "cd" = (/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
-"ce" = (/mob/living/simple_animal/syndicate/ranged/space{name = "Syndicate Officer"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
+"ce" = (/mob/living/simple_animal/hostile/syndicate/ranged/space{name = "Syndicate Officer"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
 "cf" = (/obj/machinery/door/airlock/centcom{name = "Airlock"; opacity = 1; req_access_txt = "109"},/turf/simulated/floor/plating,/area/awaymission/challenge/end)
 "cg" = (/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/turf/simulated/floor/carpet,/area/awaymission/challenge/end)
-"ch" = (/obj/structure/stool/bed/chair/comfy/black,/mob/living/simple_animal/syndicate{name = "Syndicate Commander"},/turf/simulated/floor/carpet,/area/awaymission/challenge/end)
+"ch" = (/obj/structure/stool/bed/chair/comfy/black,/mob/living/simple_animal/hostile/syndicate{name = "Syndicate Commander"},/turf/simulated/floor/carpet,/area/awaymission/challenge/end)
 "ci" = (/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor/carpet,/area/awaymission/challenge/end)
 "cj" = (/turf/simulated/floor/wood,/area/awaymission/challenge/end)
 "ck" = (/obj/structure/rack,/obj/item/weapon/gun/projectile/mateba,/turf/simulated/floor/wood,/area/awaymission/challenge/end)
-"cl" = (/mob/living/simple_animal/syndicate/melee,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
+"cl" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
 "cm" = (/obj/structure/window/reinforced{dir = 4},/turf/space,/area)
 "cn" = (/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end)
 "co" = (/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/awaymission/challenge/end)
@@ -122,7 +122,7 @@
 "cr" = (/obj/structure/table/woodentable,/obj/item/weapon/paper{info = "Congratulations,<br><br>Your station has been selected to carry out the Gateway Project.<br><br>The equipment will be shipped to you at the start of the next quarter.<br> You are to prepare a secure location to house the equipment as outlined in the attached documents.<br><br>--Nanotrasen Blue Space Research"; name = "Confidential Correspondence, Pg 1"; pixel_x = 0; pixel_y = 0},/obj/item/weapon/folder/blue,/turf/simulated/floor/carpet,/area/awaymission/challenge/end)
 "cs" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/carpet,/area/awaymission/challenge/end)
 "ct" = (/obj/structure/rack,/obj/item/weapon/gun/projectile/silenced,/turf/simulated/floor/wood,/area/awaymission/challenge/end)
-"cu" = (/mob/living/simple_animal/syndicate/melee,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/challenge/end)
+"cu" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/challenge/end)
 "cv" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/wood,/area/awaymission/challenge/end)
 "cw" = (/obj/structure/rack,/obj/item/weapon/gun/projectile/automatic/l6_saw,/turf/simulated/floor/wood,/area/awaymission/challenge/end)
 "cx" = (/obj/machinery/door/airlock/centcom{name = "Security"; opacity = 1; req_access_txt = "109"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
@@ -133,7 +133,7 @@
 "cC" = (/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end)
 "cD" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end)
 "cE" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end)
-"cF" = (/mob/living/simple_animal/syndicate/ranged,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
+"cF" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
 "cG" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end)
 "cH" = (/obj/structure/window/reinforced{dir = 1},/turf/space,/area)
 "cI" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/space,/area)
@@ -168,7 +168,7 @@
 "dl" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/space,/area)
 "dm" = (/obj/machinery/door/airlock/centcom{name = "Gateway Access"; opacity = 1; req_access_txt = "109"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
 "dn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/challenge/end)
-"do" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/mob/living/simple_animal/syndicate{name = "Syndicate Technician"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
+"do" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/mob/living/simple_animal/hostile/syndicate{name = "Syndicate Technician"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
 "dp" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end)
 "dq" = (/obj/machinery/light,/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end)
 "dr" = (/obj/structure/closet/emcloset,/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end)

maps/RandomZLevels/listeningpost.dmm

@@ -10,7 +10,7 @@
 "j" = (/obj/structure/table,/turf/simulated/floor,/area/awaymission/listeningpost)
 "k" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plating,/area/awaymission/listeningpost)
 "l" = (/obj/machinery/computer/message_monitor,/turf/simulated/floor,/area/awaymission/listeningpost)
-"m" = (/obj/structure/stool/bed/chair{dir = 4},/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/mob/living/simple_animal/syndicate,/turf/simulated/floor,/area/awaymission/listeningpost)
+"m" = (/obj/structure/stool/bed/chair{dir = 4},/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/mob/living/simple_animal/hostile/syndicate,/turf/simulated/floor,/area/awaymission/listeningpost)
 "n" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/simulated/floor,/area/awaymission/listeningpost)
 "o" = (/obj/structure/table,/obj/item/weapon/paper{info = "Intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."; name = "Intelligence"},/turf/simulated/floor,/area/awaymission/listeningpost)
 "p" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate/black/red,/obj/item/clothing/head/helmet/space/syndicate/black,/turf/simulated/floor,/area/awaymission/listeningpost)

maps/RandomZLevels/spacebattle.dmm

@@ -9,12 +9,12 @@
 "ai" = (/obj/structure/shuttle/engine/heater{tag = "icon-heater (NORTH)"; icon_state = "heater"; dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/syndicate2)
 "aj" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
 "ak" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
-"al" = (/mob/living/simple_animal/syndicate/ranged,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
+"al" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
 "am" = (/obj/structure/table/reinforced,/obj/item/clothing/suit/space/rig/syndi,/obj/item/clothing/head/helmet/space/rig/syndi,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
 "an" = (/obj/structure/table/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
 "ao" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
 "ap" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
-"aq" = (/mob/living/simple_animal/syndicate/melee,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
+"aq" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
 "ar" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
 "as" = (/obj/structure/table/reinforced,/obj/item/weapon/grenade/empgrenade,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
 "at" = (/obj/structure/table/reinforced,/obj/item/ammo_magazine/a12mm,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
@@ -31,7 +31,7 @@
 "aE" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3)
 "aF" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3)
 "aG" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate2)
-"aH" = (/obj/structure/stool/bed/chair,/mob/living/simple_animal/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
+"aH" = (/obj/structure/stool/bed/chair,/mob/living/simple_animal/hostile/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2)
 "aI" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate2)
 "aJ" = (/obj/structure/table/reinforced,/obj/item/clothing/suit/space/rig/syndi,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3)
 "aK" = (/obj/structure/table/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3)
@@ -70,7 +70,7 @@
 "br" = (/obj/structure/table/reinforced,/obj/item/weapon/grenade/spawnergrenade/manhacks,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1)
 "bs" = (/obj/structure/table/reinforced,/obj/item/weapon/handcuffs,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1)
 "bt" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate3)
-"bu" = (/obj/structure/stool/bed/chair,/mob/living/simple_animal/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3)
+"bu" = (/obj/structure/stool/bed/chair,/mob/living/simple_animal/hostile/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3)
 "bv" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate3)
 "bw" = (/obj/structure/table/reinforced,/obj/item/weapon/melee/energy/sword/red,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1)
 "bx" = (/obj/machinery/computer/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3)
@@ -79,7 +79,7 @@
 "bA" = (/obj/structure/table/reinforced,/obj/item/clothing/head/helmet/swat,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1)
 "bB" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/weapon/gun/energy/lasercannon},/turf/simulated/floor/plating,/area/awaymission/spacebattle/syndicate3)
 "bC" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate1)
-"bD" = (/obj/structure/stool/bed/chair,/mob/living/simple_animal/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1)
+"bD" = (/obj/structure/stool/bed/chair,/mob/living/simple_animal/hostile/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1)
 "bE" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate1)
 "bF" = (/obj/machinery/computer/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1)
 "bG" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate1)
@@ -114,7 +114,7 @@
 "cj" = (/turf/simulated/floor{tag = "icon-damaged5"; icon_state = "damaged5"},/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/awaymission/spacebattle/cruiser)
 "ck" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "spacebattlepod"; name = "Front Hull Door"; opacity = 1; tag = "icon-pdoor0"},/turf/simulated/shuttle/plating,/area/awaymission/spacebattle/cruiser)
 "cl" = (/turf/simulated/floor{tag = "icon-damaged4"; icon_state = "damaged4"},/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/cruiser)
-"cm" = (/mob/living/simple_animal/syndicate/melee/space,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
+"cm" = (/mob/living/simple_animal/hostile/syndicate/melee/space,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
 "cn" = (/turf/simulated/floor{tag = "icon-damaged2"; icon_state = "damaged2"},/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/awaymission/spacebattle/cruiser)
 "co" = (/turf/simulated/floor{tag = "icon-damaged4"; icon_state = "damaged4"},/area/awaymission/spacebattle/cruiser)
 "cp" = (/turf/simulated/floor{tag = "icon-damaged3"; icon_state = "damaged3"},/area/awaymission/spacebattle/cruiser)
@@ -153,11 +153,11 @@
 "cW" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/snacks/fries,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser)
 "cX" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/snacks/stew,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser)
 "cY" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser)
-"cZ" = (/mob/living/simple_animal/syndicate/melee,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
+"cZ" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
 "da" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "db" = (/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser)
 "dc" = (/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser)
-"dd" = (/mob/living/simple_animal/syndicate/ranged/space,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
+"dd" = (/mob/living/simple_animal/hostile/syndicate/ranged/space,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
 "de" = (/obj/machinery/computer/pod{id = "spacebattlepod2"; name = "Hull Door Control"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/cruiser)
 "df" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "dg" = (/obj/machinery/shieldgen{anchored = 1},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser)
@@ -216,7 +216,7 @@
 "eh" = (/obj/machinery/gateway{dir = 5},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "ei" = (/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "ej" = (/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/mecha_parts/mecha_equipment/repair_droid,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
-"ek" = (/mob/living/simple_animal/syndicate/melee,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser)
+"ek" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser)
 "el" = (/obj/structure/closet/l3closet/security,/turf/simulated/floor{icon_state = "red"; dir = 4},/area/awaymission/spacebattle/cruiser)
 "em" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/awaymission/spacebattle/cruiser)
 "en" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/engine,/area/awaymission/spacebattle/cruiser)
@@ -231,7 +231,7 @@
 "ew" = (/obj/machinery/gateway{dir = 10},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "ex" = (/obj/machinery/gateway,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "ey" = (/obj/machinery/gateway{dir = 6},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
-"ez" = (/mob/living/simple_animal/syndicate/ranged/space,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser)
+"ez" = (/mob/living/simple_animal/hostile/syndicate/ranged/space,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser)
 "eA" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/awaymission/spacebattle/cruiser)
 "eB" = (/obj/effect/landmark/corpse/bridgeofficer{mobname = "Davis Hume"; name = "Davis Hume"},/obj/item/weapon/gun/projectile/shotgun/pump/combat,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
 "eC" = (/obj/item/ammo_casing/shotgun,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
@@ -241,7 +241,7 @@
 "eG" = (/obj/structure/table/reinforced,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/awaymission/spacebattle/cruiser)
 "eH" = (/obj/structure/table/reinforced,/turf/simulated/floor{tag = "icon-bluefull"; icon_state = "bluefull"},/area/awaymission/spacebattle/cruiser)
 "eI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
-"eJ" = (/mob/living/simple_animal/syndicate/melee/space,/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser)
+"eJ" = (/mob/living/simple_animal/hostile/syndicate/melee/space,/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser)
 "eK" = (/obj/effect/landmark/corpse/engineer/rig{corpseidjob = "Gunner"; mobname = "Peter West"; name = "Peter West"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser)
 "eL" = (/turf/simulated/shuttle/wall{tag = "icon-swall13"; icon_state = "swall13"; dir = 2},/area/awaymission/spacebattle/cruiser)
 "eM" = (/turf/simulated/shuttle/wall{tag = "icon-swallc4"; icon_state = "swallc4"},/area/awaymission/spacebattle/cruiser)
@@ -254,7 +254,7 @@
 "eT" = (/obj/machinery/computer/med_data,/turf/simulated/floor{tag = "icon-bluefull"; icon_state = "bluefull"},/area/awaymission/spacebattle/cruiser)
 "eU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "eV" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate4)
-"eW" = (/obj/structure/stool/bed/chair{dir = 1},/mob/living/simple_animal/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate4)
+"eW" = (/obj/structure/stool/bed/chair{dir = 1},/mob/living/simple_animal/hostile/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate4)
 "eX" = (/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "eY" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/condiment/saltshaker,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser)
 "eZ" = (/obj/structure/table/reinforced,/obj/item/weapon/kitchen/utensil/fork,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser)
@@ -270,7 +270,7 @@
 "fj" = (/obj/structure/closet/crate,/obj/item/clothing/gloves/blue,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "fk" = (/obj/item/weapon/hand_labeler,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "fl" = (/obj/machinery/door/poddoor{id = "spacebattlestorage"; name = "Secure Storage"},/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
-"fm" = (/mob/living/simple_animal/syndicate/ranged,/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/awaymission/spacebattle/cruiser)
+"fm" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/awaymission/spacebattle/cruiser)
 "fn" = (/obj/machinery/computer/security/telescreen,/turf/simulated/shuttle/wall,/area/awaymission/spacebattle/cruiser)
 "fo" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s9"; icon_state = "swall_s9"; dir = 2},/area/awaymission/spacebattle/cruiser)
 "fp" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate4)
@@ -350,7 +350,7 @@
 "gL" = (/obj/machinery/optable,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser)
 "gM" = (/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser)
 "gN" = (/obj/machinery/vending/coffee,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser)
-"gO" = (/mob/living/simple_animal/syndicate/melee/space,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser)
+"gO" = (/mob/living/simple_animal/hostile/syndicate/melee/space,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser)
 "gP" = (/obj/machinery/computer/security,/turf/simulated/floor{tag = "icon-bluefull"; icon_state = "bluefull"},/area/awaymission/spacebattle/cruiser)
 "gQ" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser)
 "gR" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser)
@@ -395,7 +395,7 @@
 "hE" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "hF" = (/obj/structure/closet/crate/medical,/obj/item/weapon/tank/anesthetic,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "hG" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser)
-"hH" = (/mob/living/simple_animal/syndicate/melee,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser)
+"hH" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser)
 "hI" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser)
 "hJ" = (/obj/structure/table/woodentable,/obj/item/device/violin,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser)
 "hK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/engine,/area/awaymission/spacebattle/cruiser)
@@ -412,7 +412,7 @@
 "hV" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/engine,/area/awaymission/spacebattle/cruiser)
 "hW" = (/obj/effect/landmark/corpse/engineer{mobname = "Javier Wismer"; name = "Javier Wismer"},/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
 "hX" = (/obj/machinery/computer/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate7)
-"hY" = (/obj/structure/stool/bed/chair{dir = 8},/mob/living/simple_animal/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate7)
+"hY" = (/obj/structure/stool/bed/chair{dir = 8},/mob/living/simple_animal/hostile/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate7)
 "hZ" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate7)
 "ia" = (/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/obj/item/weapon/bikehorn/rubberducky,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser)
 "ib" = (/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser)
@@ -426,7 +426,7 @@
 "ij" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/o2,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser)
 "ik" = (/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser)
 "il" = (/obj/machinery/shower{tag = "icon-shower (WEST)"; icon_state = "shower"; dir = 8},/obj/item/weapon/soap,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser)
-"im" = (/mob/living/simple_animal/syndicate/ranged/space,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser)
+"im" = (/mob/living/simple_animal/hostile/syndicate/ranged/space,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser)
 "in" = (/obj/effect/landmark/corpse/doctor{mobname = "Herbert West"; name = "Herbert West"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser)
 "io" = (/obj/effect/landmark/corpse/engineer{mobname = "Carth Robinson"; name = "Carth Robinson"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser)
 "ip" = (/obj/item/ammo_casing/a12mm,/obj/item/ammo_casing/a12mm,/obj/item/ammo_casing/a12mm,/obj/item/ammo_casing/a12mm,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser)
@@ -438,7 +438,7 @@
 "iv" = (/obj/machinery/sleep_console,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/spacebattle/cruiser)
 "iw" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/spacebattle/cruiser)
 "ix" = (/obj/effect/landmark/corpse/engineer{mobname = "Cyrion"; name = "Cyrion"},/obj/item/weapon/flamethrower/full,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
-"iy" = (/mob/living/simple_animal/syndicate/ranged,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
+"iy" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
 "iz" = (/obj/effect/landmark/corpse/syndicatesoldier,/obj/item/weapon/gun/projectile/automatic/c20r,/turf/simulated/floor{tag = "icon-damaged2"; icon_state = "damaged2"},/area/awaymission/spacebattle/cruiser)
 "iA" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-burst_r (EAST)"; icon_state = "burst_r"; dir = 4},/turf/space,/area/awaymission/spacebattle/cruiser)
 "iB" = (/obj/effect/landmark/corpse/engineer{mobname = "Mercutio"; name = "Mercutio"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser)
@@ -461,7 +461,7 @@
 "iS" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area)
 "iT" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area)
 "iU" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate5)
-"iV" = (/obj/structure/stool/bed/chair{dir = 1},/mob/living/simple_animal/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate5)
+"iV" = (/obj/structure/stool/bed/chair{dir = 1},/mob/living/simple_animal/hostile/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate5)
 "iW" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area)
 "iX" = (/obj/structure/shuttle/engine/propulsion,/turf/space,/area)
 "iY" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate5)
@@ -475,7 +475,7 @@
 "jg" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate6)
 "jh" = (/obj/machinery/computer/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate6)
 "ji" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate6)
-"jj" = (/obj/structure/stool/bed/chair{dir = 1},/mob/living/simple_animal/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate6)
+"jj" = (/obj/structure/stool/bed/chair{dir = 1},/mob/living/simple_animal/hostile/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate6)
 "jk" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate6)
 "jl" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate6)
 "jm" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate6)

maps/RandomZLevels/wildwest.dmm

@@ -55,7 +55,7 @@
 "bc" = (/turf/simulated/floor/plating,/area/awaymission/wwrefine)
 "bd" = (/obj/machinery/door/airlock/sandstone,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
 "be" = (/obj/item/ammo_magazine/a12mm,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
-"bf" = (/mob/living/simple_animal/syndicate/ranged,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
+"bf" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
 "bg" = (/turf/simulated/wall/mineral/sandstone,/area)
 "bh" = (/obj/structure/largecrate,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
 "bi" = (/obj/effect/landmark/corpse/miner/rig,/obj/effect/mine/dnascramble,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
@@ -63,7 +63,7 @@
 "bk" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/wood,/area/awaymission/wwmines)
 "bl" = (/obj/effect/decal/cleanable/blood/gibs/body{tag = "icon-gibup1"; icon_state = "gibup1"},/turf/simulated/floor/wood,/area/awaymission/wwmines)
 "bm" = (/obj/effect/mine/dnascramble,/turf/simulated/floor/wood,/area/awaymission/wwmines)
-"bn" = (/mob/living/simple_animal/syndicate/ranged,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
+"bn" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
 "bo" = (/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
 "bp" = (/obj/effect/decal/cleanable/blood/gibs/body,/turf/simulated/floor/wood,/area/awaymission/wwmines)
 "bq" = (/obj/effect/landmark/corpse/miner/rig,/turf/simulated/floor/plating,/area/awaymission/wwrefine)
@@ -75,12 +75,12 @@
 "bw" = (/obj/structure/lattice,/obj/structure/window/reinforced{tag = "icon-fwindow"; icon_state = "fwindow"},/turf/space,/area)
 "bx" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaymission/wwmines)
 "by" = (/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaymission/wwmines)
-"bz" = (/mob/living/simple_animal/syndicate/ranged,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaymission/wwmines)
+"bz" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaymission/wwmines)
 "bA" = (/obj/structure/closet{icon_closed = "cabinet_closed"; icon_opened = "cabinet_open"; icon_state = "cabinet_closed"},/turf/simulated/floor/wood,/area/awaymission/wwmines)
 "bB" = (/obj/structure/stool/bed,/turf/simulated/floor/wood,/area/awaymission/wwmines)
 "bC" = (/obj/structure/table/woodentable,/obj/item/weapon/gun/projectile,/turf/simulated/floor/wood,/area/awaymission/wwmines)
 "bD" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/awaymission/wwmines)
-"bE" = (/mob/living/simple_animal/syndicate/ranged,/turf/simulated/floor/wood,/area/awaymission/wwmines)
+"bE" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/floor/wood,/area/awaymission/wwmines)
 "bF" = (/turf/simulated/floor/carpet,/area/awaymission/wwmines)
 "bG" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/barman_recipes,/turf/simulated/floor/wood,/area/awaymission/wwmines)
 "bH" = (/obj/machinery/vending/dinnerware,/turf/simulated/floor/wood,/area/awaymission/wwmines)
@@ -147,7 +147,7 @@
 "cQ" = (/obj/structure/window/reinforced{tag = "icon-fwindow (WEST)"; icon_state = "fwindow"; dir = 8},/obj/structure/window/reinforced{tag = "icon-fwindow (EAST)"; icon_state = "fwindow"; dir = 4},/obj/structure/grille,/obj/structure/window/reinforced{tag = "icon-fwindow"; icon_state = "fwindow"},/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwgov)
 "cR" = (/obj/structure/stool/bed/chair/wood/wings{dir = 4},/turf/simulated/floor/wood,/area/awaymission/wwgov)
 "cS" = (/obj/structure/window/reinforced{tag = "icon-fwindow (EAST)"; icon_state = "fwindow"; dir = 4},/obj/structure/window/reinforced{tag = "icon-fwindow (WEST)"; icon_state = "fwindow"; dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{tag = "icon-fwindow"; icon_state = "fwindow"},/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwgov)
-"cT" = (/obj/effect/decal/remains/human,/mob/living/simple_animal/syndicate/ranged/space{name = "Syndicate Commander"},/turf/simulated/floor/plating,/area/awaymission/wwrefine)
+"cT" = (/obj/effect/decal/remains/human,/mob/living/simple_animal/hostile/syndicate/ranged/space{name = "Syndicate Commander"},/turf/simulated/floor/plating,/area/awaymission/wwrefine)
 "cU" = (/obj/item/weapon/paper{info = "We've discovered something floating in space. We can't really tell how old it is, but it is scraped and bent to hell. There object is the size of about a room with double doors that we have yet to break into.   It is a lot sturdier than we could have imagined.  We have decided to call it 'The Vault' "; name = "Planer Saul's Journal: Page 1"},/turf/simulated/floor/carpet,/area/awaymission/wwgov)
 "cV" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight,/turf/simulated/floor{tag = "icon-stage_bleft"; icon_state = "stage_bleft"},/area/awaymission/wwgov)
 "cW" = (/obj/structure/table/woodentable,/obj/item/weapon/butch,/turf/simulated/floor{tag = "icon-stage_bleft"; icon_state = "stage_bleft"},/area/awaymission/wwgov)
@@ -228,7 +228,7 @@
 "et" = (/turf/simulated/wall/r_wall,/area/awaymission/wwrefine)
 "eu" = (/turf/simulated/floor,/area/awaymission/wwrefine)
 "ev" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaymission/wwmines)
-"ew" = (/mob/living/simple_animal/syndicate/ranged,/turf/simulated/floor/carpet,/area/awaymission/wwmines)
+"ew" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/floor/carpet,/area/awaymission/wwmines)
 "ex" = (/obj/structure/window/reinforced{tag = "icon-fwindow (WEST)"; icon_state = "fwindow"; dir = 8},/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand7"; icon_state = "ironsand7"},/area/awaymission/wwgov)
 "ey" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand4"; icon_state = "ironsand4"},/area/awaymission/wwgov)
 "ez" = (/obj/machinery/mineral/input,/turf/simulated/floor,/area/awaymission/wwrefine)
@@ -298,7 +298,7 @@
 "fL" = (/turf/simulated/floor/grass,/area/awaymission/wwgov)
 "fM" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{tag = "icon-fwindow (NORTH)"; icon_state = "fwindow"; dir = 1},/turf/simulated/floor/grass,/area/awaymission/wwgov)
 "fN" = (/obj/structure/window/reinforced{tag = "icon-fwindow (WEST)"; icon_state = "fwindow"; dir = 8},/obj/structure/lattice,/turf/space,/area)
-"fO" = (/mob/living/simple_animal/syndicate,/turf/simulated/floor,/area/awaymission/wwrefine)
+"fO" = (/mob/living/simple_animal/hostile/syndicate,/turf/simulated/floor,/area/awaymission/wwrefine)
 "fP" = (/obj/effect/decal/mecha_wreckage/ripley/deathripley{anchored = 1},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
 "fQ" = (/obj/effect/decal/cleanable/blood/gibs/body,/turf/simulated/floor/plating/ironsand{tag = "icon-ironsand1"; icon_state = "ironsand1"},/area/awaymission/wwmines)
 "fR" = (/obj/effect/mine/dnascramble,/obj/effect/landmark/corpse/miner/rig,/turf/simulated/floor/wood,/area/awaymission/wwmines)
@@ -320,7 +320,7 @@
 "gh" = (/obj/structure/stool/bed/chair/wood/normal{dir = 1},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/awaymission/wwmines)
 "gi" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/grass,/area/awaymission/wwgov)
 "gj" = (/obj/effect/decal/cleanable/blood/gibs/core,/turf/simulated/floor/wood,/area/awaymission/wwmines)
-"gk" = (/mob/living/simple_animal/syndicate,/turf/simulated/floor/wood,/area/awaymission/wwmines)
+"gk" = (/mob/living/simple_animal/hostile/syndicate,/turf/simulated/floor/wood,/area/awaymission/wwmines)
 "gl" = (/obj/machinery/photocopier,/turf/simulated/floor/wood,/area/awaymission/wwmines)
 "gm" = (/obj/item/weapon/gun/projectile,/turf/simulated/floor/wood,/area/awaymission/wwmines)
 "gn" = (/obj/effect/critter/creature,/turf/simulated/floor/grass,/area/awaymission/wwgov)

tgstation.dme

@@ -1122,7 +1122,6 @@
 #include "code\modules\mob\living\simple_animal\parrot.dm"
 #include "code\modules\mob\living\simple_animal\shade.dm"
 #include "code\modules\mob\living\simple_animal\simple_animal.dm"
-#include "code\modules\mob\living\simple_animal\syndicate.dm"
 #include "code\modules\mob\living\simple_animal\worm.dm"
 #include "code\modules\mob\living\simple_animal\friendly\cat.dm"
 #include "code\modules\mob\living\simple_animal\friendly\corgi.dm"
@@ -1135,6 +1134,7 @@
 #include "code\modules\mob\living\simple_animal\hostile\faithless.dm"
 #include "code\modules\mob\living\simple_animal\hostile\hostile.dm"
 #include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
+#include "code\modules\mob\living\simple_animal\hostile\syndicate.dm"
 #include "code\modules\mob\new_player\hud.dm"
 #include "code\modules\mob\new_player\login.dm"
 #include "code\modules\mob\new_player\logout.dm"