Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi

code/controllers/configuration.dm

@@ -187,6 +187,8 @@
 
 	var/max_loadout_points = 5 // How many points can be spent on extra items in character setup
 
+	var/disable_ooc_emoji = 0 // prevents people from using emoji in OOC
+
 /datum/configuration/New()
 	var/list/L = subtypesof(/datum/game_mode)
 	for(var/T in L)
@@ -580,6 +582,9 @@
 				if("medal_hub_password")
 					global.medal_pass = value
 
+				if("disable_ooc_emoji")
+					config.disable_ooc_emoji = 1
+
 				else
 					diary << "Unknown setting in configuration: '[name]'"