Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

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

@@ -149,7 +149,7 @@ var/list/_client_preferences_by_type
 	key = "SOUND_AIRPUMP"
 	enabled_description = "Audible"
 	disabled_description = "Silent"
-	
+
 /datum/client_preference/old_door_sounds
 	description ="Old Door Sounds"
 	key = "SOUND_OLDDOORS"
@@ -304,13 +304,13 @@ var/list/_client_preferences_by_type
 	key = "RUNECHAT_BORDER"
 	enabled_description = "Show"
 	disabled_description = "Hide"
-	enabled_by_default = FALSE
+	enabled_by_default = TRUE
 
 /datum/client_preference/runechat_long_messages
 	description = "Runechat Message Length"
 	key = "RUNECHAT_LONG"
-	enabled_description = "ERP KING"
-	disabled_description = "Normie"
+	enabled_description = "Long"
+	disabled_description = "Short"
 	enabled_by_default = FALSE
 
 /datum/client_preference/status_indicators/toggled(mob/preference_mob, enabled)

code/modules/client/preference_setup/loadout/loadout_xeno.dm

@@ -677,3 +677,14 @@
 	whitelisted = SPECIES_TESHARI
 	sort_category = "Xenowear"
 	cost = 4
+
+/datum/gear/shoes/teshwrap
+	display_name = "Teshari legwraps"
+	path = /obj/item/clothing/shoes/footwraps/teshari
+	sort_category = "Xenowear"
+	whitelisted = SPECIES_TESHARI
+	cost = 1
+
+/datum/gear/shoes/teshwrap/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice