cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

config. > CONFIG_GET

Browse Source
This commit is contained in:
deathride58
2017-10-01 19:56:44 -04:00
parent 8e65f4fb23
commit 70f06cfe35
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/configuration/entries/game_options.dm
View File

@@ -256,6 +256,10 @@ CONFIG_DEF(number/bombcap)
value = 14 value = 14
min_val = 4 min_val = 4
CONFIG_DEF(flag/allow_crew_objectives)
CONFIG_DEF(flag/allow_miscreants)
CONFIG_DEF(flag/allow_extended_miscreants)
/datum/config_entry/number/bombcap/ValidateAndSet(str_val) /datum/config_entry/number/bombcap/ValidateAndSet(str_val)
. = ..() . = ..()
if(.) if(.)

6
code/controllers/subsystem/ticker.dm
View File

@@ -260,9 +260,9 @@ SUBSYSTEM_DEF(ticker)
qdel(S) qdel(S)
//assign crew objectives and generate miscreants //assign crew objectives and generate miscreants
if(config.allow_extended_miscreants && GLOB.master_mode == "extended") if(CONFIG_GET(flag/allow_extended_miscreants) && GLOB.master_mode == "extended")
GLOB.miscreants_allowed = TRUE GLOB.miscreants_allowed = TRUE
if(config.allow_miscreants && GLOB.master_mode != "extended") if(CONFIG_GET(flag/allow_miscreants) && GLOB.master_mode != "extended")
GLOB.miscreants_allowed = TRUE GLOB.miscreants_allowed = TRUE
generate_crew_objectives() generate_crew_objectives()
@@ -484,7 +484,7 @@ SUBSYSTEM_DEF(ticker)
completedObjectives += "[i]<BR>" completedObjectives += "[i]<BR>"
to_chat(world, "[completedObjectives]<BR>") to_chat(world, "[completedObjectives]<BR>")
else else
if(config.allow_crew_objectives) if(CONFIG_GET(flag/allow_crew_objectives))
to_chat(world, "<B>Nobody completed their Crew Objectives!</B><BR>") to_chat(world, "<B>Nobody completed their Crew Objectives!</B><BR>")
CHECK_TICK CHECK_TICK

2
code/modules/mob/dead/new_player/new_player.dm
View File

@@ -376,7 +376,7 @@
if(prob(2) && !issilicon(humanc) && !jobban_isbanned(humanc.mind, "Syndicate") && GLOB.miscreants_allowed) if(prob(2) && !issilicon(humanc) && !jobban_isbanned(humanc.mind, "Syndicate") && GLOB.miscreants_allowed)
SSticker.generate_miscreant_objectives(humanc.mind) SSticker.generate_miscreant_objectives(humanc.mind)
else else
if(config.allow_crew_objectives) if(CONFIG_GET(flag/allow_crew_objectives))
SSticker.generate_individual_objectives(humanc.mind) SSticker.generate_individual_objectives(humanc.mind)
GLOB.joined_player_list += character.ckey GLOB.joined_player_list += character.ckey