From 6c266e08e46f76eb530891b898762eaca50128a1 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 10 Aug 2013 13:15:30 -0700 Subject: [PATCH 1/3] Fixed double worms, lowered chance of emoting. --- code/modules/mob/living/simple_animal/borer.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm index 136b6f5baf2..977c4e15355 100644 --- a/code/modules/mob/living/simple_animal/borer.dm +++ b/code/modules/mob/living/simple_animal/borer.dm @@ -54,7 +54,7 @@ if(chemicals < 250) chemicals++ if(controlling) - if(rand(0,3)) + if(prob(5)) host.adjustBrainLoss(rand(1,2)) if(prob(host.brainloss)) @@ -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..." From 857cce2da53842f172574053d9d49c70a8dec4ad Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 10 Aug 2013 13:22:35 -0700 Subject: [PATCH 2/3] Brainloss emoting tweak. --- code/modules/mob/living/simple_animal/borer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm index 977c4e15355..46ff70493c9 100644 --- a/code/modules/mob/living/simple_animal/borer.dm +++ b/code/modules/mob/living/simple_animal/borer.dm @@ -57,7 +57,7 @@ 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) From a8c892a938ec477648f46bfeab142e3579a11701 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 11 Aug 2013 14:03:46 -0700 Subject: [PATCH 3/3] Fixes Heist check_antag verb. --- code/game/gamemodes/heist/heist.dm | 4 +++- code/modules/admin/player_panel.dm | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 878f600e44b..5a1e12a191b 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/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() diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index e932ab856eb..44f1cfdd820 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -469,6 +469,13 @@ dat += "Wizard not found!" dat += "" + if(ticker.mode.raiders.len > 0) + for(var/datum/mind/raider in ticker.mode.raiders) + var/mob/M = raider.current + if(M) + dat += "[M.real_name][M.client ? "" : " (logged out)"][M.stat == 2 ? " (DEAD)" : ""]" + dat += "PM" + dat += "Show Objective" /* if(ticker.mode.ninjas.len > 0) dat += "
"
Ninjas