From 28b40c3693aeee254adc45e02c9d09b7f1938942 Mon Sep 17 00:00:00 2001 From: cib Date: Tue, 14 May 2013 00:39:29 +0200 Subject: [PATCH 1/3] New command reports that aren't stupid. It will give you a list of suspects, which uses a lot of randomization to gather up anti-NT guys, actual antags, and random people. --- code/game/gamemodes/game_mode.dm | 42 +++++++++++++++++--------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 94b9c03811..a7295a2cad 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -205,27 +205,31 @@ Implants; /datum/game_mode/proc/send_intercept() var/intercepttext = "Cent. Com. Update Requested status information:
" - intercepttext += " Cent. Com has recently been contacted by the following syndicate affiliated organisations in your area, please investigate any information you may have:" + intercepttext += " In case you have misplaced your copy, attached is a list of personnel whom reliable sources™ suspect may be affiliated with the Syndicate:" - var/list/possible_modes = list() - possible_modes.Add("revolution", "wizard", "nuke", "traitor", "malf", "changeling", "cult") - //possible_modes -= "[ticker.mode]" - var/number = pick(2, 3) - var/i = 0 - for(i = 0, i < number, i++) - possible_modes.Remove(pick(possible_modes)) - if(!intercept_hacked) - possible_modes.Insert(rand(possible_modes.len), "[ticker.mode]") - - shuffle(possible_modes) - - var/datum/intercept_text/i_text = new /datum/intercept_text - for(var/A in possible_modes) - if(modePlayer.len == 0) - intercepttext += i_text.build(A) - else - intercepttext += i_text.build(A, pick(modePlayer)) + var/list/suspects = list() + for(var/mob/living/carbon/human/man in player_list) if(man.client && man.mind) + // NT relation option + var/special_role = man.mind.special_role + if(man.client.prefs.nanotrasen_relation == "Opposed" && prob(50) || \ + man.client.prefs.nanotrasen_relation == "Skeptical" && prob(20)) + suspects += man + // Antags + else if(special_role == "traitor" && prob(20) || \ + special_role == "Changeling" && prob(100) || \ + special_role == "Cultist" && prob(10) || \ + special_role == "Head Revolutionary" && prob(10)) + suspects += man + // Some poor people who were just in the wrong place at the wrong time.. + else if(prob(5)) + suspects += man + for(var/mob/M in suspects) + switch(rand(1, 100)) + if(1 to 50) + intercepttext += "Someone with the job of [M.mind.assigned_role]
" + else + intercepttext += "[M.name], the [M.mind.assigned_role]
" for (var/obj/machinery/computer/communications/comm in world) if (!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept) From d12c3f9cf3d5e365c457820b7252a7b0004386c6 Mon Sep 17 00:00:00 2001 From: cib Date: Tue, 14 May 2013 00:58:49 +0200 Subject: [PATCH 2/3] Added a missing linebreak. --- code/game/gamemodes/game_mode.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index a7295a2cad..bb0a391978 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -205,7 +205,7 @@ Implants; /datum/game_mode/proc/send_intercept() var/intercepttext = "Cent. Com. Update Requested status information:
" - intercepttext += " In case you have misplaced your copy, attached is a list of personnel whom reliable sources™ suspect may be affiliated with the Syndicate:" + intercepttext += " In case you have misplaced your copy, attached is a list of personnel whom reliable sources™ suspect may be affiliated with the Syndicate:
" var/list/suspects = list() From bb06a18c3301391baea273a43fa0b55c5fa09926 Mon Sep 17 00:00:00 2001 From: cib Date: Tue, 14 May 2013 21:12:47 +0200 Subject: [PATCH 3/3] Reduced chance for changeling to be listed as suspect. Better than discussing this forever. --- code/game/gamemodes/game_mode.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index bb0a391978..10c0c3f631 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -217,7 +217,7 @@ Implants; suspects += man // Antags else if(special_role == "traitor" && prob(20) || \ - special_role == "Changeling" && prob(100) || \ + special_role == "Changeling" && prob(40) || \ special_role == "Cultist" && prob(10) || \ special_role == "Head Revolutionary" && prob(10)) suspects += man