From ffc50cd259efb13465d7b6949a897cc75a7336c3 Mon Sep 17 00:00:00 2001
From: skoglol <33292112+kriskog@users.noreply.github.com>
Date: Sat, 26 Oct 2019 10:02:05 +0200
Subject: [PATCH] Adds game mode panel to check antagonists window. (#47313)
About The Pull Request
Title. Also increased size of the game panel window slightly to avoid scrolling.
Why It's Good For The Game
Changelog
cl Skoglol
admin: Dynamic game mode panel can now be accessed from the Check Antagonists window.
/cl
---
code/modules/admin/admin.dm | 2 +-
code/modules/admin/check_antagonists.dm | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 38350c02292..bb02b24bd2f 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -437,7 +437,7 @@
if(marked_datum && istype(marked_datum, /atom))
dat += "Duplicate Marked Datum
"
- usr << browse(dat, "window=admin2;size=210x200")
+ usr << browse(dat, "window=admin2;size=240x280")
return
/////////////////////////////////////////////////////////////////////////////////////////////////admins2.dm merge
diff --git a/code/modules/admin/check_antagonists.dm b/code/modules/admin/check_antagonists.dm
index fc7bc11463b..97279bb6eb5 100644
--- a/code/modules/admin/check_antagonists.dm
+++ b/code/modules/admin/check_antagonists.dm
@@ -142,6 +142,8 @@
dat += "Replacement Game Mode: [SSticker.mode.replacementmode.name]
"
else
dat += "Current Game Mode: [SSticker.mode.name]
"
+ if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Currently only used by dynamic. If more start using this, find a better way.
+ dat += "Gamemode Panel
"
dat += "Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]
"
dat += "Emergency shuttle
"
if(EMERGENCY_IDLE_OR_RECALLED)
@@ -215,4 +217,4 @@
dat += build_antag_listing()
dat += "