diff --git a/code/modules/admin/check_antagonists.dm b/code/modules/admin/check_antagonists.dm index b4c72d2f0e..9adc583705 100644 --- a/code/modules/admin/check_antagonists.dm +++ b/code/modules/admin/check_antagonists.dm @@ -5,9 +5,9 @@ if(!owner) return "Unassigned" if(owner.current) - return "[owner.current.real_name]" + return "[owner.current.real_name] " else - return "[owner.name]" + return "[owner.name] " //Whatever interesting things happened to the antag admins should know about //Include additional information about antag in this part @@ -112,7 +112,7 @@ var/list/current_section = list() for(var/i in 1 to all_antagonists.len) var/datum/antagonist/current_antag = all_antagonists[i] - var/datum/antagonist/next_antag + var/datum/antagonist/next_antag if(i < all_antagonists.len) next_antag = all_antagonists[i+1] if(!current_category) @@ -133,83 +133,83 @@ return all_sections.Join("
") /datum/admins/proc/check_antagonists() - if (SSticker.HasRoundStarted()) - var/dat = "Round Status

Round Status

" - if(SSticker.mode.replacementmode) - dat += "Former Game Mode: [SSticker.mode.name]
" - dat += "Replacement Game Mode: [SSticker.mode.replacementmode.name]
" - else - dat += "Current Game Mode: [SSticker.mode.name]
" - dat += "Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]
" - dat += "Emergency shuttle
" - if(EMERGENCY_IDLE_OR_RECALLED) - dat += "Call Shuttle
" - else - var/timeleft = SSshuttle.emergency.timeLeft() - if(SSshuttle.emergency.mode == SHUTTLE_CALL) - dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
" - dat += "Send Back
" - else - dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
" - dat += "Continuous Round Status
" - dat += "[CONFIG_GET(keyed_flag_list/continuous)[SSticker.mode.config_tag] ? "Continue if antagonists die" : "End on antagonist death"]" - if(CONFIG_GET(keyed_flag_list/continuous)[SSticker.mode.config_tag]) - dat += ", [CONFIG_GET(keyed_flag_list/midround_antag)[SSticker.mode.config_tag] ? "creating replacement antagonists" : "not creating new antagonists"]
" - else - dat += "
" - if(CONFIG_GET(keyed_flag_list/midround_antag)[SSticker.mode.config_tag]) - dat += "Time limit: [CONFIG_GET(number/midround_antag_time_check)] minutes into round
" - dat += "Living crew limit: [CONFIG_GET(number/midround_antag_life_check) * 100]% of crew alive
" - dat += "If limits past: [SSticker.mode.round_ends_with_antag_death ? "End The Round" : "Continue As Extended"]
" - dat += "End Round Now
" - dat += "[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]" - var/connected_players = GLOB.clients.len - var/lobby_players = 0 - var/observers = 0 - var/observers_connected = 0 - var/living_players = 0 - var/living_players_connected = 0 - var/living_players_antagonist = 0 - var/brains = 0 - var/other_players = 0 - var/living_skipped = 0 - var/drones = 0 - for(var/mob/M in GLOB.mob_list) - if(M.ckey) - if(isnewplayer(M)) - lobby_players++ - continue - else if(M.stat != DEAD && M.mind && !isbrain(M)) - if(isdrone(M)) - drones++ - continue - if(is_centcom_level(M.z)) - living_skipped++ - continue - living_players++ - if(M.mind.special_role) - living_players_antagonist++ - if(M.client) - living_players_connected++ - else if(M.stat == DEAD || isobserver(M)) - observers++ - if(M.client) - observers_connected++ - else if(isbrain(M)) - brains++ - else - other_players++ - dat += "
Players:|[connected_players - lobby_players] ingame|[connected_players] connected|[lobby_players] lobby|" - dat += "
Living Players:|[living_players_connected] active|[living_players - living_players_connected] disconnected|[living_players_antagonist] antagonists|" - dat += "
SKIPPED \[On centcom Z-level\]: [living_skipped] living players|[drones] living drones|" - dat += "
Dead/Observing players:|[observers_connected] active|[observers - observers_connected] disconnected|[brains] brains|" - if(other_players) - dat += "
[other_players] players in invalid state or the statistics code is bugged!" - dat += "

" - - dat += build_antag_listing() - - dat += "" - usr << browse(dat, "window=roundstatus;size=500x500") + if(!SSticker.HasRoundStarted()) + alert("The game hasn't started yet!") + return + var/list/dat = list("Round Status

Round Status

") + if(SSticker.mode.replacementmode) + dat += "Former Game Mode: [SSticker.mode.name]
" + dat += "Replacement Game Mode: [SSticker.mode.replacementmode.name]
" else - alert("The game hasn't started yet!") \ No newline at end of file + dat += "Current Game Mode: [SSticker.mode.name]
" + dat += "Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]
" + dat += "Emergency shuttle
" + if(EMERGENCY_IDLE_OR_RECALLED) + dat += "Call Shuttle
" + else + var/timeleft = SSshuttle.emergency.timeLeft() + if(SSshuttle.emergency.mode == SHUTTLE_CALL) + dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
" + dat += "Send Back
" + else + dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
" + dat += "Continuous Round Status
" + dat += "[CONFIG_GET(keyed_flag_list/continuous)[SSticker.mode.config_tag] ? "Continue if antagonists die" : "End on antagonist death"]" + if(CONFIG_GET(keyed_flag_list/continuous)[SSticker.mode.config_tag]) + dat += ", [CONFIG_GET(keyed_flag_list/midround_antag)[SSticker.mode.config_tag] ? "creating replacement antagonists" : "not creating new antagonists"]
" + else + dat += "
" + if(CONFIG_GET(keyed_flag_list/midround_antag)[SSticker.mode.config_tag]) + dat += "Time limit: [CONFIG_GET(number/midround_antag_time_check)] minutes into round
" + dat += "Living crew limit: [CONFIG_GET(number/midround_antag_life_check) * 100]% of crew alive
" + dat += "If limits past: [SSticker.mode.round_ends_with_antag_death ? "End The Round" : "Continue As Extended"]
" + dat += "End Round Now
" + dat += "[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]" + var/connected_players = GLOB.clients.len + var/lobby_players = 0 + var/observers = 0 + var/observers_connected = 0 + var/living_players = 0 + var/living_players_connected = 0 + var/living_players_antagonist = 0 + var/brains = 0 + var/other_players = 0 + var/living_skipped = 0 + var/drones = 0 + for(var/mob/M in GLOB.mob_list) + if(M.ckey) + if(isnewplayer(M)) + lobby_players++ + continue + else if(M.stat != DEAD && M.mind && !isbrain(M)) + if(isdrone(M)) + drones++ + continue + if(is_centcom_level(M.z)) + living_skipped++ + continue + living_players++ + if(M.mind.special_role) + living_players_antagonist++ + if(M.client) + living_players_connected++ + else if(M.stat == DEAD || isobserver(M)) + observers++ + if(M.client) + observers_connected++ + else if(isbrain(M)) + brains++ + else + other_players++ + dat += "
Players:|[connected_players - lobby_players] ingame|[connected_players] connected|[lobby_players] lobby|" + dat += "
Living Players:|[living_players_connected] active|[living_players - living_players_connected] disconnected|[living_players_antagonist] antagonists|" + dat += "
SKIPPED \[On centcom Z-level\]: [living_skipped] living players|[drones] living drones|" + dat += "
Dead/Observing players:|[observers_connected] active|[observers - observers_connected] disconnected|[brains] brains|" + if(other_players) + dat += "
[other_players] players in invalid state or the statistics code is bugged!" + dat += "

" + + dat += build_antag_listing() + + dat += "" + usr << browse(dat.Join(), "window=roundstatus;size=500x500") \ No newline at end of file