Merge pull request #3547 from Zuhayr/master

Borer prompt, dionaea fix

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

@@ -93,4 +93,4 @@
 	deform = 'icons/mob/human_races/r_def_plant.dmi'
 	attack_verb = "slash"
 
-	flags = NO_EAT | NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT
+	flags = WHITELISTED | NO_EAT | NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT

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

@@ -67,13 +67,7 @@
 	truename = "[pick("Primary","Secondary","Tertiary","Quaternary")] [rand(1000,9999)]"
 	host_brain = new/mob/living/captive_brain(src)
 
-	for(var/mob/M in player_list)
-		if(istype(M,/mob/dead/observer))
-			var/mob/dead/observer/O = M
-			if(O.client)
-				if(O.client.prefs.be_special & BE_ALIEN)
-					src.ckey = O.ckey
-					break
+	request_player()
 
 
 /mob/living/simple_animal/borer/say(var/message)
@@ -367,4 +361,34 @@ mob/living/simple_animal/borer/proc/detatch()
 		src << text("\blue You are now hiding.")
 	else
 		layer = MOB_LAYER
-		src << text("\blue You have stopped hiding.")
+		src << text("\blue You have stopped hiding.")
+
+//Procs for grabbing players.
+mob/living/simple_animal/borer/proc/request_player()
+	for(var/mob/dead/observer/O in player_list)
+		if(jobban_isbanned(O, "Syndicate"))
+			continue
+		if(O.client)
+			if(O.client.prefs.be_special & BE_ALIEN)
+				question(O.client)
+
+mob/living/simple_animal/borer/proc/question(var/client/C)
+	spawn(0)
+		if(!C)	return
+		var/response = alert(C, "A cortical borer needs a player. Are you interested?", "Cortical borer request", "Yes", "No", "Never for this round")
+		if(!C || ckey)
+			return
+		if(response == "Yes")
+			transfer_personality(C)
+		else if (response == "Never for this round")
+			C.prefs.be_special ^= BE_ALIEN
+
+mob/living/simple_animal/borer/proc/transfer_personality(var/client/candidate)
+
+	if(!candidate)
+		return
+
+	src.mind = candidate.mob.mind
+	src.ckey = candidate.ckey
+	if(src.mind)
+		src.mind.assigned_role = "Cortical Borer"