From 56f163488621f09dc28bec69a378d7bda40056dc Mon Sep 17 00:00:00 2001 From: oranges Date: Sat, 27 Jan 2018 17:02:58 +1300 Subject: [PATCH] Merge pull request #34923 from Jordie0608/escapedisreallyamisnomerbecauseyoucanneverescapefromss13 Fixes roundend report runtime --- code/__HELPERS/roundend.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index be81becdbf..91bb4d74ca 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -59,8 +59,11 @@ else file_data["[escaped]"]["npcs"]["[initial(m.name)]"] = 1 else - var/pos = length(file_data["[escaped]"]["[category]"]) + 1 - file_data["[escaped]"]["[category]"]["[pos]"] = mob_data + if(isobserver(m)) + file_data["[escaped]"] = mob_data + else + var/pos = length(file_data["[escaped]"]["[category]"]) + 1 + file_data["[escaped]"]["[category]"]["[pos]"] = mob_data var/datum/station_state/end_state = new /datum/station_state() end_state.count() var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100) @@ -83,7 +86,7 @@ for(var/datum/antagonist/A in GLOB.antagonists) if(!A.owner) continue - + var/list/antag_info = list() antag_info["key"] = A.owner.key antag_info["name"] = A.owner.name