From 42154da4dac72872e2a55ea3c82eeb063daebada Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+AnArgonianLizardThatStealsPRs@users.noreply.github.com> Date: Thu, 16 Nov 2023 12:12:02 +0300 Subject: [PATCH] [MIRROR] Fixes lizard tail wagging graphics [MDB IGNORE] (#653) * Fixes lizard tail wagging graphics (#79723) --------- Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: thegrb93 --- code/datums/sprite_accessories.dm | 4 ++-- .../modules/surgery/organs/external/spines.dm | 3 ++- code/modules/surgery/organs/external/tails.dm | 6 ++---- .../human/species/lizard/lizard_spines.dmi | Bin 3643 -> 3643 bytes 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm index e0e84baa190..44f77fc1d76 100644 --- a/code/datums/sprite_accessories.dm +++ b/code/datums/sprite_accessories.dm @@ -2110,11 +2110,11 @@ name = "Long + Membrane" icon_state = "longmeme" -/datum/sprite_accessory/spines/aqautic +/datum/sprite_accessory/spines/aquatic name = "Aquatic" icon_state = "aqua" -/datum/sprite_accessory/spines_animated/aqautic +/datum/sprite_accessory/spines_animated/aquatic name = "Aquatic" icon_state = "aqua" diff --git a/code/modules/surgery/organs/external/spines.dm b/code/modules/surgery/organs/external/spines.dm index 04f707dff8d..1d2378a58f9 100644 --- a/code/modules/surgery/organs/external/spines.dm +++ b/code/modules/surgery/organs/external/spines.dm @@ -20,6 +20,7 @@ . = ..() if(.) paired_tail = locate(/obj/item/organ/external/tail/lizard) in receiver.organs //We want specifically a lizard tail, so we don't use the slot. + paired_tail?.paired_spines = src /obj/item/organ/external/spines/Remove(mob/living/carbon/organ_owner, special, moving) . = ..() @@ -38,7 +39,7 @@ return GLOB.sprite_accessories["spines"] // SKYRAT EDIT - Customization - ORIGINAL: return GLOB.spines_list /datum/bodypart_overlay/mutant/spines/get_base_icon_state() - return (wagging ? "wagging" : "") + sprite_datum.icon_state //add the wagging tag if we be wagging + return (wagging ? "wagging_" : "") + sprite_datum.icon_state //add the wagging tag if we be wagging /datum/bodypart_overlay/mutant/spines/can_draw_on_bodypart(mob/living/carbon/human/human) diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm index 7c7181afc83..e21f277ecf6 100644 --- a/code/modules/surgery/organs/external/tails.dm +++ b/code/modules/surgery/organs/external/tails.dm @@ -148,18 +148,16 @@ paired_spines = null /obj/item/organ/external/tail/lizard/start_wag() - . = ..() - if(paired_spines) var/datum/bodypart_overlay/mutant/spines/accessory = paired_spines.bodypart_overlay accessory.wagging = TRUE + return ..() /obj/item/organ/external/tail/lizard/stop_wag() - . = ..() - if(paired_spines) var/datum/bodypart_overlay/mutant/spines/accessory = paired_spines.bodypart_overlay accessory.wagging = FALSE + return ..() ///Lizard tail bodypart overlay datum /datum/bodypart_overlay/mutant/tail/lizard diff --git a/icons/mob/human/species/lizard/lizard_spines.dmi b/icons/mob/human/species/lizard/lizard_spines.dmi index eaadb820ebc1fa6eb496cdf376567affee52b627..82eb636b339c60975f4b276f9e5583a14914b7b1 100644 GIT binary patch delta 228 zcmV+8fu_XvQM*kh|&pIHCUo>X7wUx%phAYp%ac> zuFM(Li<~emD++E}VHxz=+(O0fU6sk(!AL^OMg9%J+CZAnIGLkr$MbyJyWwe0RjyToM%h` delta 228 zcmVmD!Y~j;*U49eb}Qm*? z^dZ^I1nwN}%p^VuqC=dJ@Eqd@C@o4!c4RYOU{s0JWOcG$VU&U3nRzGLFavey6;xk^ z1Wk2TDns|-$-^iWN;efSx+qpa6EA;B3MhaE(J@ZKK1wHGURX-*%xXo>m|nI%LMI%% z-I+706?MZ@jB_D*w>fX?Tgch7DKh&y7%8ZPOgjLq?HiLbp&9GOjf9xk!XL(A-~HhX e>q{94G2DVrq9klTSjm)