Merge pull request #3474 from Zuhayr/feature

Brain worm and heist tweaks.

code/game/gamemodes/heist/heist.dm

@@ -7,6 +7,9 @@ VOX HEIST ROUNDTYPE
 
 var/global/vox_kills = 0 //Used to check the Inviolate.
 
+/datum/game_mode/
+	var/list/datum/mind/raiders = list()  //Antags.
+
 /datum/game_mode/heist
 	name = "heist"
 	config_tag = "heist"
@@ -19,7 +22,6 @@ var/global/vox_kills = 0 //Used to check the Inviolate.
 	var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)
 
 	var/list/raid_objectives = list()     //Raid objectives.
-	var/list/datum/mind/raiders = list()  //Antags.
 	var/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' objective.
 
 /datum/game_mode/heist/announce()

code/modules/admin/player_panel.dm

@@ -469,6 +469,13 @@
 					dat += "<tr><td><i>Wizard not found!</i></td></tr>"
 			dat += "</table>"
 
+		if(ticker.mode.raiders.len > 0)
+			for(var/datum/mind/raider in ticker.mode.raiders)
+				var/mob/M = raider.current
+				if(M)
+					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
+					dat += "<td><A HREF='?src=\ref[src];traitor=\ref[M]'>Show Objective</A></td></tr>"
 		/*
 		if(ticker.mode.ninjas.len > 0)
 			dat += "<br><table cellspacing=5><tr><td><B>Ninjas</B></td><td></td><td></td></tr>"

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

@@ -54,10 +54,10 @@
 			if(chemicals < 250)
 				chemicals++
 			if(controlling)
-				if(rand(0,3))
+				if(prob(5))
 					host.adjustBrainLoss(rand(1,2))
 
-				if(prob(host.brainloss))
+				if(prob(host.brainloss/20))
 					host.say("*[pick(list("blink","blink_r","choke","aflap","drool","twitch","twitch_s","gasp"))]")
 
 				//if(host.brainloss > 100)
@@ -97,11 +97,11 @@
 		if (src.client.handle_spam_prevention(message,MUTE_IC))
 			return
 
-	/*if (copytext(message, 1, 2) == "*")
+	if (copytext(message, 1, 2) == "*")
 		return emote(copytext(message, 2))
 
 	if (copytext(message, 1, 2) == ";") //Brain borer hivemind.
-		return borer_speak(message)*/
+		return borer_speak(message)
 
 	if(!host)
 		src << "You have no host to speak to."
@@ -228,6 +228,9 @@ mob/living/simple_animal/borer/proc/detatch()
 
 	if(!M || !src) return
 
+	if(M.has_brain_worms())
+		src << "You cannot infest someone who is already infested!"
+
 	M << "Something slimy begins probing at the opening of your ear canal..."
 	src << "You slither up [M] and begin probing at their ear canal..."