From 326228c43c697599f48dd05f4fe2e3f3975f9d27 Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 23 Jan 2018 10:41:21 -0200 Subject: [PATCH] Merge pull request #34778 from ShizCalev/pollCandidatesForMob Fixes invalid pollCandidatesForMob args --- code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm | 2 +- code/game/gamemodes/cult/runes.dm | 2 +- code/modules/awaymissions/mission_code/Academy.dm | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm index 2ce9bf31d4..49cab86ff9 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm @@ -336,7 +336,7 @@ break if(!L.client || L.client.is_afk()) set waitfor = FALSE - var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [L.name], an inactive clock cultist?", "[name]", null, "Clock Cultist", 50, L) + var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [L.name], an inactive clock cultist?", ROLE_SERVANT_OF_RATVAR, null, ROLE_SERVANT_OF_RATVAR, 50, L) var/mob/dead/observer/theghost = null if(candidates.len) to_chat(L, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form!") diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 2ddf5b05ee..28cc5c6512 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -570,7 +570,7 @@ structure_check() searches for nearby cultist structures required for the invoca mob_to_revive.grab_ghost() else if(!mob_to_revive.client || mob_to_revive.client.is_afk()) set waitfor = FALSE - var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [mob_to_revive.name], an inactive blood cultist?", "[name]", null, "Blood Cultist", 50, mob_to_revive) + var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [mob_to_revive.name], an inactive blood cultist?", ROLE_CULTIST, null, ROLE_CULTIST, 50, mob_to_revive) var/mob/dead/observer/theghost = null if(candidates.len) theghost = pick(candidates) diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm index 7fefde76b0..34144f0c47 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -127,7 +127,7 @@ if(!current_wizard) return - var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as Wizard Academy Defender?", "wizard", null, be_special_flag = ROLE_WIZARD, M = current_wizard) + var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as Wizard Academy Defender?", ROLE_WIZARD, null, ROLE_WIZARD, 50, current_wizard) var/mob/dead/observer/chosen = null if(candidates.len) @@ -271,9 +271,8 @@ servant_mind.objectives += O servant_mind.transfer_to(H) - var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [user.real_name] Servant?", "wizard", mob = H) + var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [user.real_name] Servant?", ROLE_WIZARD, null, ROLE_WIZARD, 50, H) var/mob/dead/observer/chosen = null - if(candidates.len) chosen = pick(candidates) message_admins("[key_name_admin(chosen)] was spawned as Dice Servant")