From 1b3732f11f2cb5a010ef048c85de864a5f1687f4 Mon Sep 17 00:00:00 2001
From: Verkister <superverkelian@hotmail.com>
Date: Wed, 9 Aug 2017 02:12:12 +0300
Subject: [PATCH] Another small saddlebag fix. -Figured out why saddlebags
 weren't showing up on subtype taurs. -Something something spaghrtti and now
 the iconstate sets accordingly to the main type name instead of subtype name.
 -I really need to sleep this is my last second awake tonight and hopefully
 this works?

---
 .../items/weapons/storage/backpack_vr.dm      | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm
index 2b13fbbe077..8c3bbd6d9a4 100644
--- a/code/game/objects/items/weapons/storage/backpack_vr.dm
+++ b/code/game/objects/items/weapons/storage/backpack_vr.dm
@@ -40,19 +40,41 @@
 	var/icon_base = "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/list/taurtype = list(
-		/datum/sprite_accessory/tail/taur/horse,
-		/datum/sprite_accessory/tail/taur/wolf,
-		/datum/sprite_accessory/tail/taur/cow,
-		/datum/sprite_accessory/tail/taur/lizard,
-		/datum/sprite_accessory/tail/taur/feline)
 	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(..())
 			var/datum/sprite_accessory/tail/taur/TT = H.tail_style
-			if(istype(H) && is_type_in_list(TT, taurtype))
-				item_state = "[icon_base]_[TT]"
+			if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/horse))
+				item_state = "[icon_base]_horse"
+				if(H.size_multiplier >= RESIZE_BIG) //Are they a macro?
+					slowdown = 0
+				else
+					slowdown = initial(slowdown)
+				return 1
+			if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/wolf))
+				item_state = "[icon_base]_wolf"
+				if(H.size_multiplier >= RESIZE_BIG) //Are they a macro?
+					slowdown = 0
+				else
+					slowdown = initial(slowdown)
+				return 1
+			if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/cow))
+				item_state = "[icon_base]_cow"
+				if(H.size_multiplier >= RESIZE_BIG) //Are they a macro?
+					slowdown = 0
+				else
+					slowdown = initial(slowdown)
+				return 1
+			if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/lizard))
+				item_state = "[icon_base]_lizard"
+				if(H.size_multiplier >= RESIZE_BIG) //Are they a macro?
+					slowdown = 0
+				else
+					slowdown = initial(slowdown)
+				return 1
+			if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/feline))
+				item_state = "[icon_base]_feline"
 				if(H.size_multiplier >= RESIZE_BIG) //Are they a macro?
 					slowdown = 0
 				else