Removes obsolete assistant ratio code, fixes nonconstant declaration

This commit is contained in:
Arokha Sieyes
2018-01-29 01:16:02 -05:00
parent cc353dd6e4
commit 201ef9523c
4 changed files with 19 additions and 38 deletions

View File

@@ -4,8 +4,8 @@
department = "Civilian"
department_flag = CIVILIAN
faction = "Station"
total_positions = config.limit_interns //VOREStation Edit
spawn_positions = config.limit_interns //VOREStation Edit
total_positions = -1
spawn_positions = -1
supervisors = "absolutely everyone"
selection_color = "#515151"
economic_modifier = 2
@@ -13,6 +13,12 @@
minimal_access = list() //See /datum/job/assistant/get_access()
outfit_type = /decl/hierarchy/outfit/job/assistant
alt_titles = list("Engineering Intern","Medical Intern","Research Intern","Security Intern","Cargo Intern") //VOREStation Edit
//VOREStation Add
/datum/job/assistant/New()
..()
total_positions = config.limit_interns
spawn_positions = config.limit_interns
//VOREStation Add End
/datum/job/assistant/get_access()
if(config.assistant_maint)
@@ -27,8 +33,8 @@
department = "Civilian"
department_flag = CIVILIAN
faction = "Station"
total_positions = config.limit_visitors
spawn_positions = config.limit_visitors
total_positions = -1
spawn_positions = -1
supervisors = "absolutely everyone"
selection_color = "#515151"
economic_modifier = 1
@@ -36,4 +42,11 @@
minimal_access = list()
outfit_type = /decl/hierarchy/outfit/job/assistant
alt_titles = list("Test Subject")
//VOREStation Add
/datum/job/visitor/New()
..()
total_positions = config.limit_visitors
spawn_positions = config.limit_visitors
//VOREStation Add End
// VOREStation Add End

View File

@@ -103,7 +103,6 @@ var/list/admin_verbs_admin = list(
/datum/admins/proc/paralyze_mob,
/client/proc/fixatmos,
/datum/admins/proc/quick_nif, //VOREStation Add,
/datum/admins/proc/assistant_ratio, //VOREStation Add,
/datum/admins/proc/sendFax
)

View File

@@ -30,18 +30,3 @@
log_and_message_admins("[key_name(src)] Quick NIF'd [H.real_name].")
feedback_add_details("admin_verb","QNIF") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/assistant_ratio()
set category = "Admin"
set name = "Toggle Asst. Ratio"
set desc = "Toggles the assistant ratio enforcement on/off."
if(!check_rights(R_ADMIN))
return
if(isnull(config.assistants_ratio))
to_chat(usr,"<span class='warning'>Assistant ratio enforcement isn't even turned on...</span>")
return
config.assistants_ratio *= -1
to_chat(usr,"<span class='notice'>Assistant ratio enforcement now [config.assistants_ratio > 0 ? "<b>en</b>abled" : "<b>dis</b>abled"].</span>")

View File

@@ -47,22 +47,6 @@
pass = FALSE
to_chat(src,"<span class='warning'>Your custom species is not playable. Reconfigure your traits on the VORE tab.</span>")
//Assistant ratio enforcement
if (config.assistants_ratio > 0) //Stored as a negative number when inactive by admin verb
var/nonassistants = 0
var/assistants = 0
for(var/job in job_master.occupations)
var/datum/job/J = job
if(istype(J,/datum/job/assistant))
assistants += J.current_positions
else
nonassistants += J.current_positions
if(assistants != 0 && assistants >= config.assistants_assured && nonassistants/assistants < config.assistants_ratio)
pass = FALSE
to_chat(src,"There are currently [assistants] assistants, and [nonassistants] normal employees, while we enforce a specific ratio. Please join as a job instead of assistant.")
//Final popup notice
if (!pass)
alert(src,"There were problems with spawning your character. Check your message log for details.","Error","OK")