From 54ba0a7eeae475d7bf062efabeb4c15b85ba30b2 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 21 Mar 2019 06:21:23 -0700 Subject: [PATCH 1/2] Fixes ? error --- code/datums/datumvars.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 5d815472974..ffb6e7c90ff 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -715,7 +715,10 @@ log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.") var/minhours = input(usr, "Minimum hours required to play [M]?", "Set Min Hrs", 10) as num message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts with [minhours] hrs playtime") - var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [M.real_name]?", poll_time = 100, min_hours = minhours) + var/mname = M.name + if(M.real_name) + mname = M.real_name + var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [mname]?", poll_time = 100, min_hours = minhours) var/mob/dead/observer/theghost = null if(candidates.len) From 282dff25961e101a1fe0ba14e40702c5c827eb23 Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 22 Mar 2019 18:27:36 -0700 Subject: [PATCH 2/2] implements Dave's suggestion --- code/datums/datumvars.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index ffb6e7c90ff..674557bc839 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -715,10 +715,7 @@ log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.") var/minhours = input(usr, "Minimum hours required to play [M]?", "Set Min Hrs", 10) as num message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts with [minhours] hrs playtime") - var/mname = M.name - if(M.real_name) - mname = M.real_name - var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [mname]?", poll_time = 100, min_hours = minhours) + var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [M.real_name ? M.real_name : M.name]?", poll_time = 100, min_hours = minhours) var/mob/dead/observer/theghost = null if(candidates.len)