Merge pull request #2710 from Fox-McCloud/player-spider-fixes

Player Spider Fixes

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -828,6 +828,9 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		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>"
+		if(isanimal(M))
+			var/mob/living/simple_animal/S = M
+			S.master_commander = user
 		qdel(src)
 	else
 		user << "<span class='notice'>[M] looks interested for a moment, but then looks back down. Maybe you should try again later.</span>"

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

@@ -257,6 +257,7 @@
 				if(!E)
 					var/obj/effect/spider/eggcluster/C = new /obj/effect/spider/eggcluster(src.loc)
 					C.faction = faction
+					C.master_commander = master_commander
 					if(ckey)
 						C.player_spiders = 1
 					fed--

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

@@ -72,6 +72,8 @@
 	var/scan_ready = 1
 	var/simplespecies //Sorry, no spider+corgi buttbabies.
 
+	var/master_commander = null //holding var for determining who own/controls a sentient simple animal (for sentience potions).
+
 
 /mob/living/simple_animal/New()
 	..()