From 69097464ee9a663f5f1a05e31f304e9eefabb575 Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Thu, 23 Feb 2017 19:20:51 -0500
Subject: [PATCH] Fix Tempest's Saddlebags, redo how Saddlebags Work

In the title!
---
 .../items/weapons/storage/backpack_vr.dm      | 25 +++++++++++++------
 .../vore/fluffstuff/custom_items_vr.dm        | 10 +++-----
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm
index 658d5fcb7f..29e4403c2c 100644
--- a/code/game/objects/items/weapons/storage/backpack_vr.dm
+++ b/code/game/objects/items/weapons/storage/backpack_vr.dm
@@ -1,5 +1,5 @@
 /obj/item/weapon/storage/backpack/saddlebag
-	name = "Saddlebag"
+	name = "Horse Saddlebags"
 	desc = "A saddle that holds items. Seems slightly bulky."
 	icon = 'icons/obj/storage_vr.dmi'
 	icon_override = 'icons/mob/back_vr.dmi'
@@ -7,14 +7,25 @@
 	icon_state = "saddlebag"
 	max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Saddlebags can hold more, like dufflebags
 	slowdown = 1 //And are slower, too...Unless you're a macro, that is.
+	var/taurtype = /datum/sprite_accessory/tail/taur/horse //Acceptable taur type to be wearing this
+	var/no_message = "You aren't the appropriate taur type to wear this!"
+
 	mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
 		if(..())
-			if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
-				if(H.size_multiplier >= 1.5 && slowdown == 1) //Are they a macro? Is the slowdown set to 1?
+			if(istype(H) && istype(H.tail_style, taurtype))
+				if(H.size_multiplier >= RESIZE_BIG) //Are they a macro?
 					slowdown = 0
-				if(H.size_multiplier < 1.5 && slowdown == 0) //Are they a micro/not a macro? Is the slowdown set to 0?
-					slowdown = 1
+				else
+					slowdown = initial(slowdown)
 				return 1
 			else
-				H << "<span class='warning'>You need to have a horse half to wear this.</span>"
-				return 0
\ No newline at end of file
+				H << "<span class='warning'>[no_message]</span>"
+				return 0
+
+/* If anyone wants to make some... this is how you would.
+/obj/item/weapon/storage/backpack/saddlebag/spider
+	name = "Drider Saddlebags"
+	item_state = "saddlebag_drider"
+	icon_state = "saddlebag_drider"
+	var/taurtype = /datum/sprite_accessory/tail/taur/spider
+*/
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index 357c009390..efb6262048 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -581,10 +581,6 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
 	item_state = "tempestsaddlebag"
 	icon_state = "tempestbag"
 	max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Since they play a macro character, no reason to put custom slowdown code on here.
-	mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
-		if(..())
-			if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/feline/tempest))
-				return 1
-			else
-				H << "<span class='warning'>The harness doesn't fit you, it keeps slipping off!</span>"
-				return 0
+	slowdown = 0
+	taurtype = /datum/sprite_accessory/tail/taur/feline/tempest
+	no_message = "These saddlebags seem to be fitted for someone else, and keep slipping off!"