Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into navconsoles2

# Conflicts:
#	code/modules/shuttle/shuttle.dm

code/controllers/configuration.dm

@@ -67,6 +67,9 @@
 	var/assistantlimit = 0 //enables assistant limiting
 	var/assistantratio = 2 //how many assistants to security members
 
+	var/prob_free_golems = 75 //chance for free golems spawners to appear roundstart
+	var/unrestricted_free_golems = FALSE //if true, free golems can appear on all roundtypes
+
 	var/traitor_objectives_amount = 2
 	var/shadowling_max_age = 0
 
@@ -277,6 +280,12 @@
 				if("jobs_have_minimal_access")
 					config.jobs_have_minimal_access = 1
 
+				if("prob_free_golems")
+					config.prob_free_golems = text2num(value)
+
+				if("unrestricted_free_golems")
+					config.unrestricted_free_golems = TRUE
+
 				if("shadowling_max_age")
 					config.shadowling_max_age = text2num(value)
 
@@ -393,10 +402,10 @@
 
 				if("githuburl")
 					config.githuburl = value
-				
+
 				if("discordurl")
 					config.discordurl = value
-				
+
 				if("donationsurl")
 					config.donationsurl = value