diff --git a/code/controllers/subsystem/polling.dm b/code/controllers/subsystem/polling.dm index 5e58fcb47c8..479358cc4fd 100644 --- a/code/controllers/subsystem/polling.dm +++ b/code/controllers/subsystem/polling.dm @@ -147,8 +147,8 @@ SUBSYSTEM_DEF(polling) return possible_candidates -/datum/controller/subsystem/polling/proc/poll_ghost_candidates_for_mobs(question, role, check_jobban, poll_time = 30 SECONDS, list/mobs, ignore_category = null, pic_source, role_name_text) - var/list/candidate_list = poll_ghost_candidates(question, role, check_jobban, poll_time, ignore_category, pic_source, role_name_text) +/datum/controller/subsystem/polling/proc/poll_ghost_candidates_for_mobs(question, role, check_jobban, poll_time = 30 SECONDS, list/mobs, ignore_category = null, flashwindow = TRUE, pic_source, role_name_text) + var/list/candidate_list = poll_ghost_candidates(question, role, check_jobban, poll_time, ignore_category, flashwindow, pic_source, role_name_text) for(var/mob/potential_mob as anything in mobs) if(QDELETED(potential_mob) || !potential_mob.loc) @@ -179,7 +179,7 @@ SUBSYSTEM_DEF(polling) //SKYRAT EDIT ADDITION BEGIN if(is_banned_from(potential_candidate.ckey, BAN_GHOST_TAKEOVER) || is_banned_from(potential_candidate.ckey, BAN_ANTAGONIST)) to_chat(potential_candidate, "There was a ghost prompt for: [role], unfortunately you are banned from ghost takeovers.") - continue + return FALSE //SKYRAT EDIT END return TRUE diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm index 91d4c5161fa..790cdc22d81 100644 --- a/code/modules/admin/fun_balloon.dm +++ b/code/modules/admin/fun_balloon.dm @@ -87,8 +87,16 @@ if (!possessable.ckey && possessable.stat == CONSCIOUS) // Only assign ghosts to living, non-occupied mobs! bodies += possessable - var/question = "Would you like to be [group_name]?" - var/list/candidates = SSpolling.poll_ghost_candidates_for_mobs(question, check_jobban = ROLE_SENTIENCE, role = ROLE_SENTIENCE, poll_time = 10 SECONDS, mobs = bodies, ignore_category = POLL_IGNORE_SHUTTLE_DENIZENS, pic_source = src, role_name_text = "sentience fun balloon") + var/list/candidates = SSpolling.poll_ghost_candidates_for_mobs( + question = "Would you like to be [group_name]?", + role = ROLE_SENTIENCE, + check_jobban = ROLE_SENTIENCE, + poll_time = 10 SECONDS, + mobs = bodies, + ignore_category = POLL_IGNORE_SHUTTLE_DENIZENS, + pic_source = src, + role_name_text = "sentience fun balloon", + ) while(LAZYLEN(candidates) && LAZYLEN(bodies)) var/mob/dead/observer/C = pick_n_take(candidates) var/mob/living/body = pick_n_take(bodies)