From 6a09d5c981abf923013aa6533ba82e14697bc2bb Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 17 Dec 2017 00:52:00 -0500 Subject: [PATCH 1/2] Merge pull request #33578 from lzimann/job Changes manage job slots to use a browser datum, also lets it be used before roundstart --- code/modules/admin/admin.dm | 46 +++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 22365c4584..0b0957e072 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -720,41 +720,43 @@ /datum/admins/proc/manage_free_slots() if(!check_rights()) return - var/dat = "Manage Free Slots" + var/datum/browser/browser = new(usr, "jobmanagement", "Manage Free Slots", 520) + var/list/dat = list() var/count = 0 - if(!SSticker.HasRoundStarted()) - alert(usr, "You cannot manage jobs before the round starts!") + if(!SSjob.initialized) + alert(usr, "You cannot manage jobs before the job subsystem is initialized!") return - for(var/datum/job/job in SSjob.occupations) + dat += "" + + for(var/j in SSjob.occupations) + var/datum/job/job = j 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]" + dat += "" 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 += "" + dat += "" + else + dat += "Limit" - dat += "" - var/winheight = 100 + (count * 20) - winheight = min(winheight, 690) - usr << browse(dat, "window=players;size=375x[winheight]") + browser.height = min(100 + count * 20, 650) + browser.set_content(dat.Join()) + browser.open() /datum/admins/proc/create_or_modify_area() set category = "Debug"
[J_title]: [J_opPos]/[job.total_positions < 0 ? " (unlimited)" : J_totPos]" if(job.title == "AI" || job.title == "Cyborg") - dat += " (Cannot Late Join)
" + dat += " (Cannot Late Join)		" + if(job.total_positions >= 0) + dat += "Add | " + if(job.total_positions > job.current_positions) + dat += "Remove | " + else + dat += "Remove | " + dat += "Unlimit