Skip to content

Commit

Permalink
Re-enables taurs to the character creator. (#29)
Browse files Browse the repository at this point in the history
## About The Pull Request
<details>
<summary>
Re-enables taur sprites after they were commented out upstream. Tested
and found working with correct offsets so taur tails aren't floating off
the body.
</summary>
</details>


![image](https://github.com/user-attachments/assets/1818ce57-a7d3-40da-8985-fcb82c231f30)


## Changelog
:cl:
add: Taur tails return.
/:cl:

---------

Co-authored-by: Hawk-v3 <[email protected]>
Co-authored-by: valkyria-gk <[email protected]>
  • Loading branch information
3 people authored Aug 17, 2024
1 parent 5b9122d commit 0f63c2d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ var/global/list/wings_icon_cache = list()
var/icon/extra_overlay = icon(tailtype.icon, (tailtype.extra_overlay ? tailtype.extra_overlay : tailtype.icon_state)+"[(i-1)]")
extra_overlay.Blend(tail_colors[i], tailtype.blend)
tail_icon.Blend(extra_overlay, ICON_OVERLAY)
//if(istype(tailtype, /datum/sprite_accessory/tail/taur)) return image(tail_icon, "pixel_x" = -16)
if(istype(tailtype, /datum/sprite_accessory/tail/taur)) return image(tail_icon, "pixel_x" = -16) //Equinox edit, part of enabling taurs

var/tail_image = image(tail_icon)
tail_icon_cache[cache_key] = tail_image
Expand Down
4 changes: 2 additions & 2 deletions code/modules/sprite_accessories/_accessory_tail_taur.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
/ == Taur Definitions == /
/ =--------------------= /
////////////////////////////
*/

// Taur sprites are now a subtype of tail since they are mutually exclusive anyway.
// Begin Equinox edit. Un-comments this entire file.

/datum/sprite_accessory/tail/taur
name = "Hide Taur Body"
Expand Down Expand Up @@ -163,4 +164,3 @@
icon_state = "wolf_s"
colored_layers = 2

/*
1 change: 1 addition & 0 deletions sojourn-station.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3286,6 +3286,7 @@
#include "code\modules\sprite_accessories\_accessory_marking.dm"
#include "code\modules\sprite_accessories\_accessory_skin.dm"
#include "code\modules\sprite_accessories\_accessory_tail.dm"
#include "code\modules\sprite_accessories\_accessory_tail_taur.dm"
#include "code\modules\sprite_accessories\_accessory_wings.dm"
#include "code\modules\stashes\stash_datum.dm"
#include "code\modules\stashes\stash_items.dm"
Expand Down

0 comments on commit 0f63c2d

Please sign in to comment.