diff --git a/code/__defines/is_helpers.dm b/code/__defines/is_helpers.dm index 3f56ebda7fc..9a1b3871df6 100644 --- a/code/__defines/is_helpers.dm +++ b/code/__defines/is_helpers.dm @@ -60,3 +60,4 @@ #define ismineralturf(A) istype(A, /turf/simulated/mineral) #define istaurtail(A) istype(A, /datum/sprite_accessory/tail/taur) +#define islongtail(A) istype(A, /datum/sprite_accessory/tail/longtail) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index f5186fa56b6..889ed2fdfa9 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1243,9 +1243,9 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() riding_datum = new /datum/riding/taur(src) verbs |= /mob/living/carbon/human/proc/taur_mount verbs |= /mob/living/proc/toggle_rider_reins - return working - else - return working + else if(islongtail(tail_style)) + working.pixel_x = -16 + return working return null // TODO - Move this to where it should go ~Leshana diff --git a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm index ee11fd7eaed..1fd347ec475 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm @@ -1147,3 +1147,22 @@ ani_state = "tentacle_w" do_colouration = 1 color_blend_mode = ICON_MULTIPLY + +//LONG TAILS ARE NOT TAUR BUTTS >:O +/datum/sprite_accessory/tail/longtail + name = "You should not see this..." + icon = 'icons/mob/vore/taurs_vr.dmi' + do_colouration = 1 // Yes color, using tail color + color_blend_mode = ICON_MULTIPLY // The sprites for taurs are designed for ICON_MULTIPLY + +/datum/sprite_accessory/tail/longtail/shadekin_tail + name = "Shadekin Tail" + icon_state = "shadekin_s" + +/datum/sprite_accessory/tail/longtail/shadekin_tail/shadekin_tail_2c + name = "Shadekin Tail (dual color)" + extra_overlay = "shadekin_markings" + +/datum/sprite_accessory/tail/longtail/shadekin_tail/shadekin_tail_long + name = "Shadekin Long Tail" + icon_state = "shadekin_long_s" diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 66233db64c4..cc0d2472c25 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -326,20 +326,3 @@ icon_state = "mermaid_s" can_ride = 0 icon_sprite_tag = "mermaid" - -/datum/sprite_accessory/tail/taur/shadekin_tail - name = "Shadekin Tail" - icon_state = "shadekin_s" - can_ride = 0 - hide_body_parts = null - clip_mask_icon = null - clip_mask_state = null - //species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) - -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_2c - name = "Shadekin Tail (dual color)" - extra_overlay = "shadekin_markings" - -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_long - name = "Shadekin Long Tail" - icon_state = "shadekin_long_s" diff --git a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm index 1652fbfca9b..60228a35327 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm @@ -478,24 +478,6 @@ msg_prey_stepunder = "You jump over %prey's thick tail." msg_owner_stepunder = "%owner bounds over your tail." -/datum/sprite_accessory/tail/taur/shadekin_tail - name = "Shadekin Tail" - icon_state = "shadekin_s" - can_ride = 0 - hide_body_parts = null - clip_mask_icon = null - clip_mask_state = null - //apply_restrictions = TRUE - //species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) - -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_2c - name = "Shadekin Tail (dual color)" - extra_overlay = "shadekin_markings" - -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_long - name = "Shadekin Long Tail" - icon_state = "shadekin_long_s" - /datum/sprite_accessory/tail/taur/pawcow // this grabs suit sprites from the normal cow, the outline is the same name = "Cow w/ paws (Taur)" icon_state = "pawcow_s" diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index f67b29720d2..7d433c9f411 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ