Merge branch 'master' into upstream-merge-31309

This commit is contained in:
LetterJay
2017-10-07 01:07:59 -04:00
committed by GitHub
47 changed files with 1229 additions and 309 deletions

View File

@@ -256,6 +256,10 @@ CONFIG_DEF(number/bombcap)
value = 14
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)
. = ..()
if(.)