From d38580afcdd9151643d9a8e4d8d63a2b7bbc7965 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 26 Aug 2017 11:07:20 -0500 Subject: [PATCH] Holoparasite prompts now have a "Never For This Round" option --- code/_globalvars/lists/poll_ignore.dm | 1 + code/modules/mob/living/simple_animal/guardian/guardian.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm index fadd68526d..f88c4aab85 100644 --- a/code/_globalvars/lists/poll_ignore.dm +++ b/code/_globalvars/lists/poll_ignore.dm @@ -6,5 +6,6 @@ #define POLL_IGNORE_ALIEN_LARVA "alien_larva" #define POLL_IGNORE_CLOCKWORK_MARAUDER "clockwork_marauder" #define POLL_IGNORE_SYNDICATE "syndicate" +#define POLL_IGNORE_HOLOPARASITE "holoparasite" GLOBAL_LIST_EMPTY(poll_ignore) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 21a3347d3d..1f1f937d9a 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -490,7 +490,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians return used = TRUE to_chat(user, "[use_message]") - var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, null, FALSE, 100) + var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_HOLOPARASITE) var/mob/dead/observer/theghost = null if(candidates.len)