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 Window Damage Overlays #787

Merged
merged 1 commit into from
Nov 23, 2023
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25201
Original PR: tgstation/tgstation#79876

About The Pull Request

Since tgstation/tgstation#78719, Windows lacked their damage overlays. This PR removes the one line responsible that broke the overlays.

Why It's Good For The Game

Fixes: tgstation/tgstation#79082

Changelog

🆑 TwistedSilicon
fix: Window damage overlays have been fixed.
/:cl:

Before
Before.mp4
After
After.mp4

image
(I swear one day I will make a PR longer than 2 lines... but today is not that day.)

* Fixes Window Damage Overlays (#79876)

## About The Pull Request

Since tgstation/tgstation#78719, Windows lacked
their damage overlays. This PR removes the **_one_** line responsible
that broke the overlays.
## Why It's Good For The Game

Fixes: tgstation/tgstation#79082
## Changelog
:cl: TwistedSilicon
fix: Window damage overlays have been fixed.
/:cl:

<details>
  <summary>Before</summary>

https://github.com/tgstation/tgstation/assets/106436013/694d2e46-0c76-4695-ad52-72c3cc292646

</details>
<details>
  <summary>After</summary>

https://github.com/tgstation/tgstation/assets/106436013/d843fe5c-aaab-4784-827e-5132e7acdd5e

</details>

![image](https://github.com/tgstation/tgstation/assets/106436013/77c40048-5e2c-4db7-b5c1-581bf78d6999)
(I swear one day I will make a PR longer than 2 lines... but today is
not that day.)

---------

Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com>

* Fixes Window Damage Overlays

---------

Co-authored-by: TwistedCicrularConvexLens <[email protected]>
Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com>
@ReezeBL ReezeBL merged commit b0f2c2c into master Nov 23, 2023
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-25201 branch November 23, 2023 19:14
AnywayFarus added a commit that referenced this pull request Nov 23, 2023
Iajret pushed a commit that referenced this pull request Feb 6, 2024
* Mothic Fleet Rations now leave trash (#81280)

## About The Pull Request

During the feature freeze someone pointed out that it was weird that
mothic rations can get dirty if dropped on the floor, as they're
supposed to be inside wrappers.
I added a trash type to them, which has the added side-effect of the
game assuming that if it leaves trash it probably doesn't get dirty when
dropped on the ground.

I also changed the colour of the text on the wrapper from black to very
very dark brown because I didn't like drawing it in black on the
wrapper.

## Why It's Good For The Game

More immersive. More Janitor content.

## Changelog

:cl:
add: Mothic Fleet Rations now no longer get dirty or decompose if left
on the floor, due to their wrappers.
/:cl:

* Mothic Fleet Rations now leave trash

---------

Co-authored-by: Jacquerel <[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.

windows lost damage overlays
3 participants