From ccb4de685661f2a7340cbbe4ff95528af403e81a Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Thu, 14 Mar 2024 21:36:26 -0400 Subject: [PATCH] [MIRROR] [no gbp] fix span type errors with poll alerts (#1445) * [no gbp] fix span type errors with poll alerts (#81979) type mismatch due to feeding non text into span defines * [no gbp] fix span type errors with poll alerts --------- Co-authored-by: 13spacemen <46101244+13spacemen@users.noreply.github.com> --- code/modules/antagonists/cult/cult_comms.dm | 2 +- code/modules/mob/transform_procs.dm | 2 +- code/modules/research/xenobiology/xenobiology.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index 01aac3e8691..17dcdc37789 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -147,7 +147,7 @@ asked_cultists += team_member.current var/list/yes_voters = SSpolling.poll_candidates( - question = "[span_notice(nominee)] seeks to lead your cult, do you support [nominee.p_them()]?", + question = "[span_notice(nominee.name)] seeks to lead your cult, do you support [nominee.p_them()]?", poll_time = 30 SECONDS, group = asked_cultists, alert_pic = nominee, diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 28d89cf4cb4..270136ddd94 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -184,7 +184,7 @@ to_chat(src, "You are job banned from cyborg! Appeal your job ban if you want to avoid this in the future!") ghostize(FALSE) - var/mob/chosen_one = SSpolling.poll_ghosts_for_target("Do you want to play as [span_notice(src)]?", check_jobban = JOB_CYBORG, poll_time = 5 SECONDS, checked_target = src, alert_pic = src, role_name_text = "cyborg") + var/mob/chosen_one = SSpolling.poll_ghosts_for_target("Do you want to play as [span_notice(name)]?", check_jobban = JOB_CYBORG, poll_time = 5 SECONDS, checked_target = src, alert_pic = src, role_name_text = "cyborg") if(chosen_one) message_admins("[key_name_admin(chosen_one)] has taken control of ([key_name_admin(src)]) to replace a jobbanned player.") key = chosen_one.key diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index ba568c4bc74..d3f9c9b5a8d 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -709,7 +709,7 @@ balloon_alert(user, "offering...") being_used = TRUE var/mob/chosen_one = SSpolling.poll_ghosts_for_target( - question = "[span_danger(user)] is offering [span_notice(dumb_mob)] an intelligence potion! Reason: [span_boldnotice(potion_reason)]", + question = "[span_danger(user.name)] is offering [span_notice(dumb_mob.name)] an intelligence potion! Reason: [span_boldnotice(potion_reason)]", check_jobban = ROLE_SENTIENCE, poll_time = 20 SECONDS, checked_target = dumb_mob,