diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index d8eb4c7457..8df9836f32 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -22,6 +22,7 @@ var/sql_enabled = 1 // for sql switching var/allow_admin_ooccolor = 0 // Allows admins with relevant permissions to have their own ooc colour var/allow_vote_restart = 0 // allow votes to restart + var/ert_admin_call_only = 0 var/allow_vote_mode = 0 // allow votes to change mode var/allow_admin_jump = 1 // allows admin jumping var/allow_admin_spawning = 1 // allows admin item spawning @@ -290,6 +291,9 @@ if ("vote_autogamemode_timeleft") config.vote_autogamemode_timeleft = text2num(value) + if("ert_admin_only") + config.ert_admin_call_only = 1 + if ("allow_ai") config.allow_ai = 1 diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 06c89d467b..1364f579bb 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -69,7 +69,9 @@ if(screen == 1) dat += "Select an event to trigger:" @@ -152,8 +154,9 @@ revoke_maint_all_access() feedback_inc("alert_keycard_auth_maintRevoke",1) if("Emergency Response Team") - trigger_armed_response_team(1) - feedback_inc("alert_keycard_auth_ert",1) + if(!config.ert_admin_call_only) + trigger_armed_response_team(1) + feedback_inc("alert_keycard_auth_ert",1) var/global/maint_all_access = 0 @@ -170,4 +173,4 @@ var/global/maint_all_access = 0 /obj/machinery/door/airlock/allowed(mob/M) if(maint_all_access && src.check_access_list(list(access_maint_tunnels))) return 1 - return ..(M) \ No newline at end of file + return ..(M) diff --git a/config/example/config.txt b/config/example/config.txt index 18e623fdc4..28a803d8e7 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -94,6 +94,9 @@ TRAITOR_SCALING ## if objectives are disabled #OBJECTIVES_DISABLED +## make ERT's be only called by admins +#ERT_ADMIN_ONLY + ## If security is prohibited from being most antagonists #PROTECT_ROLES_FROM_ANTAGONIST