From 8fd14ca0954888c73c6618797fef680f39ab26fc Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Date: Sun, 11 Jan 2026 22:15:36 +0000 Subject: [PATCH] Fixes Skeleton Crew Access Revokation Spam (#31431) * Update SSjobs.dm * spooky scary skeleton closet announcement --- .../controllers/configuration/sections/job_configuration.dm | 4 ++-- code/controllers/subsystem/SSjobs.dm | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/controllers/configuration/sections/job_configuration.dm b/code/controllers/configuration/sections/job_configuration.dm index fb8c167d8af..384734b1d57 100644 --- a/code/controllers/configuration/sections/job_configuration.dm +++ b/code/controllers/configuration/sections/job_configuration.dm @@ -36,8 +36,8 @@ /datum/configuration_section/job_configuration/load_data(list/data) // Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line CONFIG_LOAD_BOOL(allow_skeleton_crew_access, data["allow_skeleton_crew_access"]) - CONFIG_LOAD_BOOL(skeleton_crew_threshold, data["skeleton_crew_threshold"]) - CONFIG_LOAD_BOOL(skeleton_crew_escape_threshold, data["skeleton_crew_escape_threshold"]) + CONFIG_LOAD_NUM(skeleton_crew_threshold, data["skeleton_crew_threshold"]) + CONFIG_LOAD_NUM(skeleton_crew_escape_threshold, data["skeleton_crew_escape_threshold"]) CONFIG_LOAD_BOOL(restrict_jobs_on_account_age, data["restrict_jobs_on_account_age"]) CONFIG_LOAD_BOOL(restrict_jobs_on_account_age_admin_bypass, data["restrict_jobs_on_account_age_admin_bypass"]) CONFIG_LOAD_BOOL(enable_exp_tracking, data["enable_exp_tracking"]) diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm index 387ba47ffa7..17cc92ee797 100644 --- a/code/controllers/subsystem/SSjobs.dm +++ b/code/controllers/subsystem/SSjobs.dm @@ -601,8 +601,10 @@ SUBSYSTEM_DEF(jobs) if(!skeleton_crew) GLOB.minor_announcement.Announce("Due to reduced crew numbers, extended departmental access has been unlocked on crew IDs.", "Extended Access Enabled") skeleton_crew = TRUE - else - if(skeleton_crew >= GLOB.configuration.jobs.skeleton_crew_escape_threshold) + return + + if(skeleton_crew >= GLOB.configuration.jobs.skeleton_crew_escape_threshold) + if(skeleton_crew && !skeleton_revoke_timer) GLOB.minor_announcement.Announce("Crew count is now above minimal levels, extended departmental access will be revoked from crew IDs in 2 minutes. \ If your ID access has not been upgraded by the Head of Personnel, please vacate any areas you do not normally have access to.", "Extended Access Disabled") skeleton_revoke_timer = addtimer(CALLBACK(src, PROC_REF(deactivate_skeleton_access)), 2 MINUTES, TIMER_STOPPABLE)