Merge remote-tracking branch 'upstream/master' into job_refactor_tg

code/_globalvars/configuration.dm

@@ -19,6 +19,10 @@ var/shuttle_left = 0
 var/tinted_weldhelh = 1
 var/mouse_respawn_time = 5 //Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes.
 
+// Command to run if shutting down (SHUTDOWN_ON_REBOOT) instead of rebooting
+// It's defined here as a global because this is a hilariously bad thing to have on the easily-edited config datum
+var/global/shutdown_shell_command
+
 // Debug is used exactly once (in living.dm) but is commented out in a lot of places.  It is not set anywhere and only checked.
 // Debug2 is used in conjunction with a lot of admin verbs and therefore is actually legit.
 var/Debug = 0	// global debug switch

code/_globalvars/lists/misc.dm

@@ -20,4 +20,12 @@ var/list/restricted_camera_networks = list( //Those networks can only be accesse
 
 var/list/mineral_turfs = list()
 
-var/list/ruin_landmarks = list()
+var/list/ruin_landmarks = list()
+
+var/list/round_end_sounds = list( // Maps available round end sounds to their duration
+		'sound/AI/newroundsexy.ogg' = 2.3 SECONDS,
+		'sound/misc/apcdestroyed.ogg' = 3 SECONDS,
+		'sound/misc/bangindonk.ogg' = 1.6 SECONDS,
+		'sound/goonstation/misc/newround1.ogg' = 6.9 SECONDS,
+		'sound/goonstation/misc/newround2.ogg' = 14.8 SECONDS
+		)