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] fixes item blood overlays "leaking" onto other objects #2137

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1142
Original PR: tgstation/tgstation#81662

Looks like KEEP_TOGETHER is necessary after all

before
Screenshot 2024-02-24 144648

after
Screenshot 2024-02-24 144001

Changelog

🆑 13spacemen
fix: Blood overlays on items no longer leak onto other objects
/:cl:

…cts (#1142)

* [NO GBP] fixes item blood overlays "leaking" onto other objects (#81662)

Looks like KEEP_TOGETHER is necessary after all

before
![Screenshot 2024-02-24
144648](https://github.com/tgstation/tgstation/assets/46101244/e973b372-8391-4678-bc26-28b9d32f05af)

after
![Screenshot 2024-02-24
144001](https://github.com/tgstation/tgstation/assets/46101244/b6c25fcd-9c7f-4f3a-8b8f-69d98b81d424)


## Changelog
:cl:
fix: Blood overlays on items no longer leak onto other objects
/:cl:

* [NO GBP] fixes item blood overlays "leaking" onto other objects

---------

Co-authored-by: 13spacemen <[email protected]>
@Iajret Iajret merged commit b0097da into master Feb 29, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-1142 branch February 29, 2024 18:17
AnywayFarus added a commit that referenced this pull request Feb 29, 2024
Iajret pushed a commit that referenced this pull request Apr 23, 2024
…'t do cogwheels (#2137)

* Getting up from prone, z movement, and mod de/activation don't do cogwheels

* Update living.dm

---------

Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: Mal <[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