From 36d5b7636f6cce138f8624aa9624826823ba0fc1 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Sat, 28 Nov 2015 14:28:27 -0500
Subject: [PATCH] Simple Animal Faction Fixes

---
 code/modules/mob/living/carbon/metroid/metroid.dm        | 2 +-
 code/modules/mob/living/simple_animal/hostile/hivebot.dm | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm
index 86d3db3d733..1aa9e0f6191 100644
--- a/code/modules/mob/living/carbon/metroid/metroid.dm
+++ b/code/modules/mob/living/carbon/metroid/metroid.dm
@@ -824,7 +824,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		C = pick(consenting_candidates)
 		M.key = C.key
 		M.universal_speak = 1
-		M.faction -= "neutral"
+		M.faction |= "sentient"
 		M << "<span class='warning'>All at once it makes sense: you know what you are and who you are! Self awareness is yours!</span>"
 		M << "<span class='userdanger'>You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost.</span>"
 		user << "<span class='notice'>[M] accepts the potion and suddenly becomes attentive and aware. It worked!</span>"
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 5e57e2c8f7e..68aeeb72616 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -94,11 +94,14 @@
 			bot_amt--
 			switch(bot_type)
 				if("norm")
-					new /mob/living/simple_animal/hostile/hivebot(get_turf(src))
+					var/mob/living/simple_animal/hostile/hivebot/H = new /mob/living/simple_animal/hostile/hivebot(get_turf(src))
+					H.faction = faction
 				if("range")
-					new /mob/living/simple_animal/hostile/hivebot/range(get_turf(src))
+					var/mob/living/simple_animal/hostile/hivebot/range/R = new /mob/living/simple_animal/hostile/hivebot/range(get_turf(src))
+					R.faction = faction
 				if("rapid")
-					new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
+					var/mob/living/simple_animal/hostile/hivebot/rapid/F = new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
+					F.faction = faction
 		spawn(100)
 			qdel(src)
 		return