diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index bc086e2d73..352707db22 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -7,7 +7,7 @@ var/global/datum/controller/gameticker/ticker
/datum/controller/gameticker
- var/const/restart_timeout = 250
+ var/const/restart_timeout = 600
var/current_state = GAME_STATE_PREGAME
var/hide_mode = 0
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 1cc6d4bccc..6350d02f29 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -409,6 +409,10 @@ var/global/floorIsLava = 0
dat += "Create Turf
"
if(lvl >= 5)
dat += "Create Mob
"
+ if(lvl >= 3 )
+ dat += "
Edit Airflow Settings
"
+ dat += "Edit Plasma Settings
"
+ dat += "Choose a default ZAS setting
"
// if(lvl == 6 )
usr << browse(dat, "window=admin2;size=210x180")
return
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 263c80105e..3b66c3f8e4 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -150,6 +150,8 @@
verbs += /client/proc/deadmin_self
verbs += /client/proc/player_panel_new
verbs += /client/proc/cmd_admin_change_custom_event
+ verbs += /client/proc/game_panel
+
//verbs += /client/proc/cmd_admin_attack_log --Merged with view variables
else return
diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index c10d4b494f..ffb47bea84 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -2580,4 +2580,13 @@ var/list/admin_datums = list()
if(href_list["ac_set_signature"])
src.admincaster_signature = adminscrub(input(usr, "Provide your desired signature", "Network Identity Handler", ""))
- src.access_news_network()
\ No newline at end of file
+ src.access_news_network()
+
+ if(href_list["vsc"])
+ if ((src.rank in list( "Moderator", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
+ if(href_list["vsc"] == "airflow")
+ vsc.ChangeSettingsDialog(usr,vsc.settings)
+ if(href_list["vsc"] == "plasma")
+ vsc.ChangeSettingsDialog(usr,vsc.plc.settings)
+ if(href_list["vsc"] == "default")
+ vsc.SetDefault(usr)