Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync

# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm

code/modules/client/preference_setup/global/setting_datums.dm

@@ -126,6 +126,12 @@ var/list/_client_preferences_by_type
 	enabled_description = "Show"
 	disabled_description = "Hide"
 
+/datum/client_preference/check_mention
+	description ="Emphasize Name Mention"
+	key = "CHAT_MENTION"
+	enabled_description = "Emphasize"
+	disabled_description = "Normal"
+
 /datum/client_preference/show_progress_bar
 	description ="Progress Bar"
 	key = "SHOW_PROGRESS"