Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync

# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).

code/modules/client/client procs.dm

@@ -74,21 +74,6 @@
 
 	..()	//redirect to hsrc.Topic()
 
-/client/proc/handle_spam_prevention(var/message, var/mute_type)
-	if(config.automute_on && !holder && src.last_message == message)
-		src.last_message_count++
-		if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE)
-			src << "\red You have exceeded the spam filter limit for identical messages. An auto-mute was applied."
-			cmd_admin_mute(src.mob, mute_type, 1)
-			return 1
-		if(src.last_message_count >= SPAM_TRIGGER_WARNING)
-			src << "\red You are nearing the spam filter limit for identical messages."
-			return 0
-	else
-		last_message = message
-		src.last_message_count = 0
-		return 0
-
 //This stops files larger than UPLOAD_LIMIT being sent from client to server via input(), client.Import() etc.
 /client/AllowUpload(filename, filelength)
 	if(filelength > UPLOAD_LIMIT)

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

@@ -61,3 +61,11 @@
 			lunchboxes[initial(lunchbox.name)] = lunchbox_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(lunchboxes))
 	gear_tweaks += new/datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks())
+
+/datum/gear/towel
+	display_name = "towel"
+	path = /obj/item/weapon/towel
+
+/datum/gear/towel/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)

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

@@ -88,72 +88,72 @@
 		shorts[initial(short_type.name)] = short_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorts))
 
-/datum/gear/uniform/skirt/ce
+/datum/gear/uniform/job_skirt/ce
 	display_name = "skirt, ce"
 	path = /obj/item/clothing/under/rank/engineer/chief_engineer/skirt
 	allowed_roles = list("Chief Engineer")
 
-/datum/gear/uniform/skirt/atmos
+/datum/gear/uniform/job_skirt/atmos
 	display_name = "skirt, atmos"
 	path = /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt
 	allowed_roles = list("Chief Engineer","Atmospheric Technician")
 
-/datum/gear/uniform/skirt/eng
+/datum/gear/uniform/job_skirt/eng
 	display_name = "skirt, engineer"
 	path = /obj/item/clothing/under/rank/engineer/skirt
 	allowed_roles = list("Chief Engineer","Station Engineer")
 
-/datum/gear/uniform/skirt/roboticist
+/datum/gear/uniform/job_skirt/roboticist
 	display_name = "skirt, roboticist"
 	path = /obj/item/clothing/under/rank/roboticist/skirt
 	allowed_roles = list("Research Director","Roboticist")
 
-/datum/gear/uniform/skirt/cmo
+/datum/gear/uniform/job_skirt/cmo
 	display_name = "skirt, cmo"
 	path = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
 	allowed_roles = list("Chief Medical Officer")
 
-/datum/gear/uniform/skirt/chem
+/datum/gear/uniform/job_skirt/chem
 	display_name = "skirt, chemist"
 	path = /obj/item/clothing/under/rank/medical/chemist/skirt
 	allowed_roles = list("Chief Medical Officer","Chemist")
 
-/datum/gear/uniform/skirt/viro
+/datum/gear/uniform/job_skirt/viro
 	display_name = "skirt, virologist"
 	path = /obj/item/clothing/under/rank/medical/virologist/skirt
 	allowed_roles = list("Chief Medical Officer","Medical Doctor")
 
-/datum/gear/uniform/skirt/med
+/datum/gear/uniform/job_skirt/med
 	display_name = "skirt, medical"
 	path = /obj/item/clothing/under/rank/medical/skirt
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
 
-/datum/gear/uniform/skirt/sci
+/datum/gear/uniform/job_skirt/sci
 	display_name = "skirt, scientist"
 	path = /obj/item/clothing/under/rank/scientist/skirt
 	allowed_roles = list("Research Director","Scientist", "Xenobiologist")
 
-/datum/gear/uniform/skirt/cargo
+/datum/gear/uniform/job_skirt/cargo
 	display_name = "skirt, cargo"
 	path = /obj/item/clothing/under/rank/cargotech/skirt
 	allowed_roles = list("Quartermaster","Cargo Technician")
 
-/datum/gear/uniform/skirt/qm
+/datum/gear/uniform/job_skirt/qm
 	display_name = "skirt, QM"
 	path = /obj/item/clothing/under/rank/cargo/skirt
 	allowed_roles = list("Quartermaster")
 
-/datum/gear/uniform/skirt/warden
+/datum/gear/uniform/job_skirt/warden
 	display_name = "skirt, warden"
 	path = /obj/item/clothing/under/rank/security/warden/skirt
 	allowed_roles = list("Head of Security", "Warden")
 
-/datum/gear/uniform/skirt/security
+/datum/gear/uniform/job_skirt/security
 	display_name = "skirt, security"
 	path = /obj/item/clothing/under/rank/security/skirt
 	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
 
-/datum/gear/uniform/skirt/head_of_security
+/datum/gear/uniform/job_skirt/head_of_security
 	display_name = "skirt, hos"
 	path = /obj/item/clothing/under/rank/security/head_of_security/skirt
 	allowed_roles = list("Head of Security")