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/game/objects/items/trash.dm

@@ -9,11 +9,15 @@
 
 /obj/item/trash/raisins
 	name = "\improper 4no raisins"
-	icon_state= "4no_raisins"
+	icon_state = "4no_raisins"
 
 /obj/item/trash/candy
 	name = "candy"
-	icon_state= "candy"
+	icon_state = "candy"
+
+/obj/item/trash/candy/proteinbar
+	name = "protein bar"
+	icon_state = "proteinbar"
 
 /obj/item/trash/cheesie
 	name = "\improper Cheesie Honkers"

code/game/objects/items/weapons/clown_items.dm

@@ -34,6 +34,10 @@
 	//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
 	if(user.client && (target in user.client.screen))
 		user << "<span class='notice'>You need to take that [target.name] off before cleaning it.</span>"
+	else if(istype(target,/obj/effect/decal/cleanable/blood))
+		user << "<span class='notice'>You scrub \the [target.name] out.</span>"
+		target.clean_blood()
+		return	//Blood is a cleanable decal, therefore needs to be accounted for before all cleanable decals.
 	else if(istype(target,/obj/effect/decal/cleanable))
 		user << "<span class='notice'>You scrub \the [target.name] out.</span>"
 		qdel(target)

code/game/objects/items/weapons/storage/belt.dm

@@ -187,7 +187,8 @@
 		/obj/item/device/flash,
 		/obj/item/weapon/flame/lighter,
 		/obj/item/weapon/reagent_containers/food/snacks/donut/,
-		/obj/item/ammo_magazine
+		/obj/item/ammo_magazine,
+		/obj/item/weapon/gun/projectile/colt/detective
 		)
 
 /obj/item/weapon/storage/belt/soulstone

code/game/objects/items/weapons/towels.dm

@@ -0,0 +1,14 @@
+/obj/item/weapon/towel
+	name = "towel"
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "towel"
+	slot_flags = SLOT_HEAD | SLOT_BELT | SLOT_OCLOTHING
+	force = 3.0
+	w_class = 3.0
+	attack_verb = list("whipped")
+	hitsound = "towelwhip"
+	desc = "A soft cotton towel."
+
+/obj/item/weapon/towel/attack_self(mob/living/user as mob)
+	user.visible_message(text("<span class='notice'>[] uses [] to towel themselves off.</span>", user, src))
+	playsound(user, 'sound/weapons/towelwipe.ogg', 25, 1)