From fa176c3b5c21fb4c6b0eb0e37160870892826b7f Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 2 Oct 2020 17:50:08 +0300 Subject: [PATCH 1/3] Couple taur fixes. Fixes skunk being a wolf subtype and thus going for the wolf fitted taursuits (oops) Also fixes the taur riding mechanics not allowing non-ridable "taur tails" (aka tails just using the subtype for wider sprites without actually being taurs) to ride. --- .../appearance/sprite_accessories_taur_vr.dm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm index 4257afa1d6..afabd204c4 100644 --- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm @@ -68,8 +68,10 @@ var/mob/living/carbon/human/H = M if(isTaurTail(H.tail_style)) - to_chat(src,"Too many legs. TOO MANY LEGS!!") - return FALSE + var/datum/sprite_accessory/tail/taur/ridertype = H.tail_style + if(ridertype.can_ride) + to_chat(src,"Too many legs. TOO MANY LEGS!!") + return FALSE . = ..() if(.) @@ -190,18 +192,18 @@ extra_overlay = "fatwolf_markings" //icon_sprite_tag = "fatwolf2c" -/datum/sprite_accessory/tail/taur/wolf/skunk - name = "Skunk (Taur)" - icon_state = "skunk_s" - extra_overlay = "skunk_markings" - icon_sprite_tag = "skunk" - /datum/sprite_accessory/tail/taur/wolf/synthwolf name = "SynthWolf dual-color (Taur)" icon_state = "synthwolf_s" extra_overlay = "synthwolf_markings" //icon_sprite_tag = "synthwolf" +/datum/sprite_accessory/tail/taur/skunk + name = "Skunk (Taur)" + icon_state = "skunk_s" + extra_overlay = "skunk_markings" + icon_sprite_tag = "skunk" + /datum/sprite_accessory/tail/taur/naga name = "Naga (Taur)" icon_state = "naga_s" From a00e979e1784e84d5a8dfe2d8991eff1adcb9ba6 Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 2 Oct 2020 17:56:42 +0300 Subject: [PATCH 2/3] haha me funney --- code/modules/vore/appearance/sprite_accessories_taur_vr.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm index afabd204c4..a880c24fc4 100644 --- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm @@ -70,6 +70,9 @@ if(isTaurTail(H.tail_style)) var/datum/sprite_accessory/tail/taur/ridertype = H.tail_style if(ridertype.can_ride) + if(istype(ridertype, /datum/sprite_accessory/tail/taur/naga) || istype(ridertype, /datum/sprite_accessory/tail/taur/slug)) + to_chat(src,"Too many legs. TOO FEW LEGS!!") + return FALSE to_chat(src,"Too many legs. TOO MANY LEGS!!") return FALSE From b1dd9b0531495ab4fa4dd32e2532e8929fced29a Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 2 Oct 2020 17:57:15 +0300 Subject: [PATCH 3/3] Update sprite_accessories_taur_vr.dm --- code/modules/vore/appearance/sprite_accessories_taur_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm index a880c24fc4..e2c3a86b9d 100644 --- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm @@ -71,7 +71,7 @@ var/datum/sprite_accessory/tail/taur/ridertype = H.tail_style if(ridertype.can_ride) if(istype(ridertype, /datum/sprite_accessory/tail/taur/naga) || istype(ridertype, /datum/sprite_accessory/tail/taur/slug)) - to_chat(src,"Too many legs. TOO FEW LEGS!!") + to_chat(src,"Too few legs. TOO FEW LEGS!!") return FALSE to_chat(src,"Too many legs. TOO MANY LEGS!!") return FALSE