Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Adds Short tail override and mutant color alt #1087

Merged
merged 1 commit into from
Dec 12, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#25291

About The Pull Request

This is the SR downstream patch of 79990 on TG, also by me. They are intended to be rolled out concurrently. This will make it safe to mirror 79990 and prevent invisible tails. It will not cause conflicts and can be preemptively merged, but won't do anything on its own. but will add in addition to 79990 a two-tone variant of the upstream version.

This PR adds a short tail for lizard characters called Short. It is about half the length of the other tails. This tail has been fully sprited in 9-frame animation in accordance with the sprite style in use by other lizard tails. Hope you like my work; this is my first PR, let me know if I am missing anything.

For reasons unknown to me, SR has an override on the lizard tails to turn their TG steel-blue grayscale palette into a true grayscale. This accounts for the override file and matches the SR lizard grayscale palette. Thgvr's tweak of my spriteset for Shiptest 2542 has been retweaked so the two-tone variant he created conforms to this true greyscale and shows more lateral movement within the wag.

How This Contributes To The Skyrat Roleplay Experience

I did this because a few lizard players requested it of me; clearly there is a desire to more accurately express their characters and this will help them do so. Anything that can do that is a boon for roleplay experience in my book.

Proof of Testing

Screenshots/Videos

dreamseeker_LXSuKnOkgt

sogtail
(L-R wag only looks faster because it accounts for the tail getting higher at either edge of its swing)

sogtail_tg
(Smooth for comparison)

Changelog

🆑 whataboutism-alos
code: Skyrat sprite override updated to reflect upstream lizard tail
add: Adds two-tone version of short lizard tail
/:cl:

* Adds Short tail override

For reasons unknown to me, SR has an override on the lizard tails to turn their TG steel-blue grayscale palette into a true grayscale. This accounts for the override file and matches the SR lizard grayscale palette.

* Added two-tone tail. Still fixing bugs with it.

Added two-tone tail. m_tail_short2tone_BEHIND_secondary is not playing nice though.

* Wagwagwagwagwagwagwag

* Makes front_secondary line up with front_primary for wagging. Why were these disjointed by one pixel???

Oops!

* Update skyrat_config.txt

* Update skyrat_config.txt

Removes moan; untested

* Update skyrat_config.txt

---------

Co-authored-by: Bloop <[email protected]>
@Iajret Iajret merged commit ae65f0d into master Dec 12, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25291 branch December 12, 2023 23:25
AnywayFarus added a commit that referenced this pull request Dec 12, 2023
Iajret pushed a commit that referenced this pull request Feb 21, 2024
…f the way. (#1087)

* sec-hailers no longer apply filters on TTS when pushed out of the way. (#81569)

## About The Pull Request
Previously, pushing the mask out of the way did not prevent TTS from
being filtered.

## Why It's Good For The Game
If the mask isn't in the way, it shouldn't do that. Simple as that.

* sec-hailers no longer apply filters on TTS when pushed out of the way.

---------

Co-authored-by: Ghom <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants