Skip to content

Commit

Permalink
[MIRROR] [no gbp] fix span type errors with poll alerts (#1445)
Browse files Browse the repository at this point in the history
* [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 <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed Mar 15, 2024
1 parent 3bb12e3 commit ccb4de6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/modules/antagonists/cult/cult_comms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/transform_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
to_chat(src, "<b>You are job banned from cyborg! Appeal your job ban if you want to avoid this in the future!</b>")
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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/xenobiology/xenobiology.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit ccb4de6

Please sign in to comment.