Merge branch 'master' into upstream-merge-31116

2017-10-01 15:09:10 -04:00
parent 49c63dd794 4e80c2574a
commit 5ec781502c
199 changed files with 71828 additions and 5775 deletions
@@ -55,7 +55,7 @@
 	var/obj/machinery/hydroponics/parent = loc
 	var/make_podman = 0
 	var/ckey_holder = null
-	if(config.revival_pod_plants)
+	if(CONFIG_GET(flag/revival_pod_plants))
 		if(ckey)
 			for(var/mob/M in GLOB.player_list)
 				if(isobserver(M))