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] Fixed hair gradients not applying properly on dismembered heads #292

Merged
merged 2 commits into from
Oct 25, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24585
Original PR: tgstation/tgstation#79231

About The Pull Request

Previously on dismembered heads, the overlay for hair and facial hair gradients would be rendered based on the dir var of the head object, while the rest of the sprites would always render facing south. Now the overlays are rendered facing south as well.

Changelog

🆑 Cruix
fix: fixed hair gradients not applying properly on dismembered heads.
/:cl:

…ads [MDB IGNORE] (#24585)

* Fixed hair gradients not applying properly on dismembered heads

* Update head_hair_and_lips.dm

---------

Co-authored-by: Cruix <[email protected]>
Co-authored-by: Giz <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror Fix labels Oct 25, 2023
@ReezeBL ReezeBL merged commit d4d1727 into master Oct 25, 2023
22 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-24585 branch October 25, 2023 21:00
AnywayFarus added a commit that referenced this pull request Oct 25, 2023
Iajret pushed a commit that referenced this pull request Jan 4, 2024
#292)

* Saves some free lag by removing some in area (in world) loops (#80644)

## About The Pull Request

Goes through and changes some `in area` / `in a` loops to use
`get_contained_turfs` to cut down on `in_world` loops. Saves some free
lag.

## Changelog

:cl: Melbert
fix: Some things which affect everything in an area are less laggy, the
"all lights are broken" station trait especially
/:cl:

* Saves some free lag by removing some in area (in world) loops

* Update lightswitch.dm

* Modular updates

* Update lightswitch.dm

* Update area_spawn_subsystem.dm

* Update modular_nova/modules/automapper/code/area_spawn_subsystem.dm

* Revert "Update modular_nova/modules/automapper/code/area_spawn_subsystem.dm"

This reverts commit 5816e3332ecfcd1c8c0657be19d69cc5a4019f88.

* Revert "Update area_spawn_subsystem.dm"

This reverts commit 9a6ef9be1d9455c175a15b6f88057c1a130ef6c1.

* Update area_spawn_subsystem.dm

---------

Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Giz <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants