cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed maint access game_option magic numbers to defines

Browse Source
This commit is contained in:
MrPerson
2013-05-08 16:14:55 -07:00
parent cd9a8ac104
commit f6cc4cc0c6
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration.dm
+11 -4
View File
@@ -1,3 +1,10 @@
//Configuraton defines //TODO: Move all yes/no switches into bitflags
//Used by jobs_have_maint_access
#define ASSISTANTS_HAVE_MAINT_ACCESS 1
#define SECURITY_HAS_MAINT_ACCESS 2
#define EVERYONE_HAS_MAINT_ACCESS 4
/datum/configuration
var/server_name = null // server name (for world name / status)
var/server_suffix = 0 // generate numeric suffix based on server port
@@ -44,7 +51,7 @@
var/ToRban = 0
var/automute_on = 0 //enables automuting/spam prevention
var/jobs_have_minimal_access = 0 //determines whether jobs use minimal access or expanded access.
var/jobs_have_maint_access = 0 //Who gets maint access? 1 = assistants, 2 = security, 3 = assistants and sec, 4 = everyone
var/jobs_have_maint_access = 0 //Who gets maint access? See defines above
var/server
var/banappeals
@@ -298,11 +305,11 @@
if("alert_delta")
config.alert_desc_delta = value
if("assistants_have_maint_access")
config.jobs_have_maint_access |= 1
config.jobs_have_maint_access |= ASSISTANTS_HAVE_MAINT_ACCESS
if("security_has_maint_access")
config.jobs_have_maint_access |= 2
config.jobs_have_maint_access |= SECURITY_HAS_MAINT_ACCESS
if("everyone_has_maint_access")
config.jobs_have_maint_access |= 4
config.jobs_have_maint_access |= EVERYONE_HAS_MAINT_ACCESS
if("gateway_delay")
config.gateway_delay = text2num(value)
if("continuous_rounds")
code/game/jobs/job/assistant.dm
+1 -1
View File
@@ -17,7 +17,7 @@
return 1
/datum/job/assistant/get_access()
if(config.jobs_have_maint_access & 1) //Config has assistant maint access set
if(config.jobs_have_maint_access & ASSISTANTS_HAVE_MAINT_ACCESS) //Config has assistant maint access set
. = ..()
. |= list(access_maint_tunnels)
else
code/game/jobs/job/job.dm
+1 -1
View File
@@ -87,7 +87,7 @@
else
. = src.access.Copy()
if(config.jobs_have_maint_access & 4) //Config has universal maint access set
if(config.jobs_have_maint_access & EVERYONE_HAS_MAINT_ACCESS) //Config has global maint access set
. |= list(access_maint_tunnels)
//If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1
code/game/jobs/job/security.dm
+2 -2
View File
@@ -85,7 +85,7 @@
return 1
/datum/job/warden/get_access()
if(config.jobs_have_maint_access & 2) //Config has sec maint access set
if(config.jobs_have_maint_access & SECURITY_HAS_MAINT_ACCESS) //Config has sec maint access set
. = ..()
. |= list(access_maint_tunnels)
else
@@ -175,7 +175,7 @@
return 1
/datum/job/officer/get_access()
if(config.jobs_have_maint_access & 2) //Config has sec maint access set
if(config.jobs_have_maint_access & SECURITY_HAS_MAINT_ACCESS) //Config has sec maint access set
. = ..()
. |= list(access_maint_tunnels)
else