Kaleidoscope 2: The Retabbening (#7697)

* Begins the Project

* Move things to where they belong, if viable.

* Merge and move those files.

* Finish filenames, fix Taj ears.

* Tweak to Ater's Requests

* The Great Mergening with 03_body.

* Per Requests

* Continue per request. Plot nefarious plans to make Saviks usable as battlemounts.

* Smarter Proc Use

* Tweaken

code/game/objects/items.dm

@@ -789,7 +789,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	drop_sound = 'sound/items/drop/device.ogg'
 
 //Worn icon generation for on-mob sprites
-/obj/item/proc/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer)
+/obj/item/proc/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null)
 	//Get the required information about the base icon
 	var/icon/icon2use = get_worn_icon_file(body_type = body_type, slot_name = slot_name, default_icon = default_icon, inhands = inhands)
 	var/state2use = get_worn_icon_state(slot_name = slot_name)
@@ -817,6 +817,9 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	standing.color = color
 	standing.layer = layer2use
 
+	if(istype(clip_mask)) //For taur bodies/tails clipping off parts of uniforms and suits.
+		standing.filters += filter(type = "alpha", icon = clip_mask)
+
 	//Apply any special features
 	if(!inhands)
 		apply_blood(standing)			//Some items show blood when bloodied

code/game/objects/items/weapons/material/twohanded.dm

@@ -163,3 +163,14 @@
 	fragile = 1	//It's a haphazard thing of glass, wire, and steel
 	reach = 2 // Spears are long.
 	attackspeed = 14
+
+/obj/item/weapon/material/twohanded/riding_crop
+	name = "riding crop"
+	desc = "A rod, a little over a foot long with a widened grip and a thick, leather patch at the end. Used since the dawn of the West to control animals."
+	force_divisor = 0.05 //Required in order for the X attacks Y message to pop up.
+	unwielded_force_divisor = 1 // One here, too.
+	applies_material_colour = 1
+	unbreakable = 1
+	base_icon = "riding_crop"
+	icon_state = "riding_crop0"
+	attack_verb = list("cropped","spanked","swatted","smacked","peppered")