diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index e6a1b3d383..358465ffc0 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -444,7 +444,7 @@
if("Hard Restart (No Delay, No Feeback Reason)")
world.Reboot()
if("Hardest Restart (No actions, just reboot)")
- world.Reboot(fast_track = TRUE)
+ world.Reboot(fast_track = TRUE)
if("Service Restart (Force restart DD)")
GLOB.reboot_mode = REBOOT_MODE_HARD
world.ServiceReboot()
@@ -597,7 +597,7 @@
log_admin("[key_name(usr)] delayed the round start.")
else
to_chat(world, "The game will start in [newtime] seconds.")
- SEND_SOUND(world, sound('sound/ai/attention.ogg'))
+ world << 'sound/ai/attention.ogg'
log_admin("[key_name(usr)] set the pre-game delay to [newtime] seconds.")
SSblackbox.add_details("admin_verb","Delay Game Start") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -737,33 +737,34 @@
var/dat = "Manage Free Slots"
var/count = 0
- if(!SSticker.HasRoundStarted())
+ if(SSticker && !SSticker.mode)
alert(usr, "You cannot manage jobs before the round starts!")
return
- for(var/datum/job/job in SSjob.occupations)
- count++
- var/J_title = html_encode(job.title)
- var/J_opPos = html_encode(job.total_positions - (job.total_positions - job.current_positions))
- var/J_totPos = html_encode(job.total_positions)
- if(job.total_positions < 0)
- dat += "[J_title]: [J_opPos] (unlimited)"
- else
- dat += "[J_title]: [J_opPos]/[J_totPos]"
-
- if(job.title == "AI" || job.title == "Cyborg")
- dat += " (Cannot Late Join)
"
- continue
- if(job.total_positions >= 0)
- dat += " Add | "
- if(job.total_positions > job.current_positions)
- dat += "Remove | "
+ if(SSjob)
+ for(var/datum/job/job in SSjob.occupations)
+ count++
+ var/J_title = html_encode(job.title)
+ var/J_opPos = html_encode(job.total_positions - (job.total_positions - job.current_positions))
+ var/J_totPos = html_encode(job.total_positions)
+ if(job.total_positions < 0)
+ dat += "[J_title]: [J_opPos] (unlimited)"
else
- dat += "Remove | "
- dat += "Unlimit"
- else
- dat += " Limit"
- dat += "
"
+ dat += "[J_title]: [J_opPos]/[J_totPos]"
+
+ if(job.title == "AI" || job.title == "Cyborg")
+ dat += " (Cannot Late Join)
"
+ continue
+ if(job.total_positions >= 0)
+ dat += " Add | "
+ if(job.total_positions > job.current_positions)
+ dat += "Remove | "
+ else
+ dat += "Remove | "
+ dat += "Unlimit"
+ else
+ dat += " Limit"
+ dat += "
"
dat += ""
var/winheight = 100 + (count * 20)