Merge branch 'master' into upstream-merge-31129

2017-10-01 15:45:54 -04:00
parent 2635689e79 19abe58f05
commit 6ca3deb8d1
205 changed files with 71846 additions and 7047 deletions
@@ -6,7 +6,7 @@
 	earliest_start = 0

 /datum/round_event_control/wizard/summonguns/New()
-	if(config.no_summon_guns)
+	if(CONFIG_GET(flag/no_summon_guns))
 		weight = 0
 	..()

@@ -21,7 +21,7 @@
 	earliest_start = 0

 /datum/round_event_control/wizard/summonmagic/New()
-	if(config.no_summon_magic)
+	if(CONFIG_GET(flag/no_summon_magic))
 		weight = 0
 	..()