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] Updates CTF Card Sprites #1021

Merged
merged 1 commit into from
Dec 7, 2023
Merged

[MIRROR] Updates CTF Card Sprites #1021

merged 1 commit into from
Dec 7, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25479
Original PR: tgstation/tgstation#80144

About The Pull Request

image

Now ALL the cards in card.dmi (except Retro) are clean and updated!

(One thing for debate: should all have the white text? Yellow has white since it was impossible to get it as a 'lighter yellow' like how the others are lighter colored text)

Why It's Good For The Game

Not really something people see, but a bit of polish never hurts!

Now I've just gotta boot up a CTF match one of these days and find what else needs respriting and cleanup. Maybe some remapping wouldn't hurt too...

Changelog

🆑 OrionTheFox
image: resprited CTF ID Cards
/:cl:

* Updates CTF Card Sprites (#80144)

* Updates CTF Card Sprites

---------

Co-authored-by: OrionTheFox <[email protected]>
@Iajret Iajret merged commit a585da6 into master Dec 7, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25479 branch December 7, 2023 14:54
AnywayFarus added a commit that referenced this pull request Dec 7, 2023
Iajret pushed a commit that referenced this pull request Feb 18, 2024
* Fixes smoothing breaking if a map is loaded post init (#81526)

## About The Pull Request

We'd finish a set of atom creation, then try and smooth those atoms The
problem is they might try and smooth with an uninitialized neighbor,
which wouldn't have its smoothing vars parsed.

This fixes that by pooling "to be smoothed" things into a list based off
the source of the init stoppage, which we then release when we're done.

Also fixes things staying in mapload, even during a sleep. This can
cause massive headaches so it's good to avoid.

This has a cost but it's minuscule (on the order of like 0.006s (6ms
over all of init), so I'm happy with it.

## Why It's Good For The Game

Closes #77040

## Changelog
:cl:
fix: Maps loaded in after roundstart will no longer have broken
smoothing
/:cl:

* Fixes smoothing breaking if a map is loaded post init

---------

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