Merge pull request #3607 from Citadel-Station-13/upstream-merge-32076

[MIRROR] Fixes SoC creating braindead aliens
2017-10-26 16:53:40 -04:00
parent 67c93bc430 15db082b4e
commit bdeaa6e886
1 changed files with 8 additions and 2 deletions
@@ -158,9 +158,15 @@
 			new_mob = new /mob/living/simple_animal/slime/random(M.loc)
 		if("xeno")
 			if(prob(50))
-				new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc)
+				if(!M.ckey) //spawn an AI alien if it isn't a player controlled mob.
+					new_mob = new /mob/living/simple_animal/hostile/alien(M.loc)
+				else
+					new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc)
 			else
-				new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc)
+				if(!M.ckey)
+					new_mob = new /mob/living/simple_animal/hostile/alien/sentinel(M.loc)
+				else
+					new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc)

 		if("animal")
 			var/path