diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index c3079bf3d5..0dbfa689e1 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -163,20 +163,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" if(changelings.len) var/text = "The changelings were:" for(var/datum/mind/changeling in changelings) - var/changelingwin = 1 - - text += "
[changeling.key] was [changeling.name] (" - if(changeling.current) - if(changeling.current.stat == DEAD) - text += "died" - else - text += "survived" - if(changeling.current.real_name != changeling.name) - text += " as [changeling.current.real_name]" - else - text += "body destroyed" - changelingwin = 0 - text += ")" + var/changelingwin = changeling.current + text += printplayer(changeling) //Removed sanity if(changeling) because we -want- a runtime to inform us that the changelings list is incorrect and needs to be fixed. text += "
Changeling ID: [changeling.changeling.changelingID]." @@ -200,6 +188,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" else text += "
The changeling has failed." feedback_add_details("changeling_success","FAIL") + text += "
" world << text diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 4ddfbffb48..e6e70ff35f 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -334,17 +334,7 @@ if( cult.len || (ticker && istype(ticker.mode,/datum/game_mode/cult)) ) var/text = "The cultists were:" for(var/datum/mind/cultist in cult) - - text += "
[cultist.key] was [cultist.name] (" - if(cultist.current) - if(cultist.current.stat == DEAD) - text += "died" - else - text += "survived" - if(cultist.current.real_name != cultist.name) - text += " as [cultist.current.real_name]" - else - text += "body destroyed" - text += ")" + text += printplayer(cultist) + text += "
" world << text diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 34b8947389..d40d94655d 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -509,4 +509,20 @@ proc/get_nt_opposed() player.current << "\blue Your current objectives:" for(var/datum/objective/objective in player.objectives) player.current << "Objective #[obj_count]: [objective.explanation_text]" - obj_count++ \ No newline at end of file + obj_count++ + +/datum/game_mode/proc/printplayer(var/datum/mind/ply) + var/role = "\improper[ply.assigned_role]" + var/text = "
[ply.name]([ply.key]) as \a [role] (" + if(ply.current) + if(ply.current.stat == DEAD) + text += "died" + else + text += "survived" + if(ply.current.real_name != ply.name) + text += " as [ply.current.real_name]" + else + text += "body destroyed" + text += ")" + + return text diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index fa7b55c7f8..484cf4052c 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -383,7 +383,7 @@ var/global/datum/controller/gameticker/ticker var/turf/playerTurf = get_turf(Player) if(emergency_shuttle.departed && emergency_shuttle.evac) if(playerTurf.z != 2) - Player << "You managed to survive, but were marooned on [station_name()]..." + Player << "You managed to survive, but were marooned on [station_name()] as [Player.real_name]..." else Player << "You managed to survive the events on [station_name()] as [Player.real_name]." else if(playerTurf.z == 2) @@ -391,7 +391,7 @@ var/global/datum/controller/gameticker/ticker else if(issilicon(Player)) Player << "You remain operational after the events on [station_name()] as [Player.real_name]." else - Player << "You missed the crew transfer after events on [station_name()] as [Player.real_name]." + Player << "You missed the crew transfer after the events on [station_name()] as [Player.real_name]." else Player << "You did not survive the events on [station_name()]..." world << "
" diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index efdde45906..1f6fbf4496 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -180,18 +180,7 @@ var/text = "The traitors were:" for(var/datum/mind/traitor in traitors) var/traitorwin = 1 - - text += "
[traitor.key] was [traitor.name] (" - if(traitor.current) - if(traitor.current.stat == DEAD) - text += "died" - else - text += "survived" - if(traitor.current.real_name != traitor.name) - text += " as [traitor.current.real_name]" - else - text += "body destroyed" - text += ")" + text += printplayer(traitor) if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this. var/count = 1 @@ -218,6 +207,8 @@ text += "
The [special_role_text] has failed!" feedback_add_details("traitor_success","FAIL") + text += "
" + world << text return 1