From 0743e0ddb3a62d780d19cc4cb56410497714aa2e Mon Sep 17 00:00:00 2001 From: Amunak Date: Fri, 21 Nov 2014 11:28:40 +0100 Subject: [PATCH 1/3] Round end summary now shows full player list and more round information --- code/game/gamemodes/game_mode.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 17e85c9fb18..cf042d3f44c 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -151,7 +151,11 @@ var/list/area/escape_locations = list(/area/shuttle/escape/centcom, /area/shuttle/escape_pod1/centcom, /area/shuttle/escape_pod2/centcom, /area/shuttle/escape_pod3/centcom, /area/shuttle/escape_pod5/centcom) + var/pltext = "Player list:" + for(var/mob/M in player_list) + if(M.mind) + pltext += printplayer(M.mind) if(M.client) clients++ if(ishuman(M)) @@ -179,6 +183,12 @@ if(isobserver(M)) ghosts++ + var/text = "A round of [src.name] has ended.
" + text += "There [surviving_total==1 ? "was" : "were"] [surviving_total] [surviving_total==1 ? "survivor" : "survivors"]" + text += " ([escaped_total>0 ? escaped_total : "none"] escaped) and [ghosts] ghosts.
" + text += "
" + pltext //print player list after the general info + world << text + if(clients > 0) feedback_set("round_end_clients",clients) if(ghosts > 0) From c6211b0eca4df28b90e9d18e683c3d995ef176a9 Mon Sep 17 00:00:00 2001 From: Amunak Date: Fri, 21 Nov 2014 11:29:29 +0100 Subject: [PATCH 2/3] Fixed missing space in the printplayer proc output --- code/game/gamemodes/game_mode.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index cf042d3f44c..aeea30758ce 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -525,7 +525,7 @@ proc/get_nt_opposed() /datum/game_mode/proc/printplayer(var/datum/mind/ply) var/role = ply.assigned_role == "MODE" ? "\improper[ply.special_role]" : "\improper[ply.assigned_role]" - var/text = "
[ply.name]([ply.key]) as \a [role] (" + var/text = "
[ply.name] ([ply.key]) as \a [role] (" if(ply.current) if(ply.current.stat == DEAD) text += "died" From 5dab47c156c8524cc512c127a5f8ad5fc52bdea3 Mon Sep 17 00:00:00 2001 From: Amunak Date: Fri, 21 Nov 2014 13:35:41 +0100 Subject: [PATCH 3/3] Updated the end of round messages for better fit --- code/game/gamemodes/game_mode.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index aeea30758ce..12d9278205a 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -183,9 +183,12 @@ if(isobserver(M)) ghosts++ - var/text = "A round of [src.name] has ended.
" - text += "There [surviving_total==1 ? "was" : "were"] [surviving_total] [surviving_total==1 ? "survivor" : "survivors"]" - text += " ([escaped_total>0 ? escaped_total : "none"] escaped) and [ghosts] ghosts.
" + var/text = "A round of [src.name] has ended." + if(surviving_total > 0) + text += "
There [surviving_total>1 ? "were [surviving_total] survivors" : "was one survivor"]" + text += " ([escaped_total>0 ? escaped_total : "none"] [emergency_shuttle.evac ? "escaped" : "transferred"]) and [ghosts] ghosts.
" + else + text += "There were no survivors ([ghosts] ghosts)." text += "
" + pltext //print player list after the general info world << text