Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization

Conflicts:
	code/_onclick/telekinesis.dm

code/controllers/configuration.dm

@@ -99,6 +99,7 @@
 	var/revival_brain_life = -1
 
 	var/rename_cyborg = 0
+	var/ooc_during_round = 0
 
 	//Used for modifying movement speed for mobs.
 	//Unversal modifiers
@@ -281,6 +282,8 @@
 					config.revival_brain_life		= text2num(value)
 				if("rename_cyborg")
 					config.rename_cyborg			= 1
+				if("ooc_during_round")
+					config.ooc_during_round			= 1
 				if("run_delay")
 					config.run_speed				= text2num(value)
 				if("walk_delay")