Merge branch 'master' into upstream-merge-9974

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

@@ -177,4 +177,15 @@
 	default_material = "DEFAULT_WALL_MATERIAL"
 	fragile = 0
 	sharp = 1
-	edge = 0
+	edge = 0
+
+/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")

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

@@ -0,0 +1,9 @@
+//1R1S: Malady Blanche
+/obj/item/weapon/material/twohanded/riding_crop/malady
+	name = "Malady's riding crop"
+	icon = 'icons/vore/custom_items_vr.dmi'
+	item_icons = list(
+				slot_l_hand_str = 'icons/vore/custom_items_left_hand_vr.dmi',
+				slot_r_hand_str = 'icons/vore/custom_items_right_hand_vr.dmi',
+				)
+	desc = "An infernum made riding crop with Malady Blanche engraved in the shaft. It's a little worn from how many butts it has spanked."