Skip to content

Commit

Permalink
[MIRROR] Fixes lizard tail wagging graphics [MDB IGNORE] (#653)
Browse files Browse the repository at this point in the history
* Fixes lizard tail wagging graphics (#79723)

---------

Co-authored-by: SkyratBot <[email protected]>
Co-authored-by: thegrb93 <[email protected]>
  • Loading branch information
3 people authored Nov 16, 2023
1 parent c716aad commit 42154da
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions code/datums/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 2 additions & 1 deletion code/modules/surgery/organs/external/spines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand All @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions code/modules/surgery/organs/external/tails.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/mob/human/species/lizard/lizard_spines.dmi
Binary file not shown.

0 comments on commit 42154da

Please sign in to comment.