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

Merge Stable 26/11/24 #488

Merged
merged 395 commits into from
Nov 29, 2024
Merged

Merge Stable 26/11/24 #488

merged 395 commits into from
Nov 29, 2024

Conversation

LankLTE
Copy link
Contributor

@LankLTE LankLTE commented Nov 27, 2024

Fairly big & a bunch of probably fucked up commits, so.

UbaserB and others added 30 commits November 17, 2024 23:32
* Shift Air Alarm sprites to better reflect their direction

* Fix two frames of west-facing sprite being one pixel off

* Indicate that sprites are no longer exactly tgstation's
Fix station events schedulers, antag selection and possibly other systems acting weird in a rare scenario
* Changes the Server Worker job icon to a bowtie.

* Removes grey from icon to better fit existing art.

* Updated ID card sprite.

* Edit respective meta.json files.
removed fun
* toggle clothing fix

* some adding
This doesn't switch the projects over to .NET 9, but it does make them work on .NET 9 when we decide to switch in the future.
* move riot crate from security to armory category

* Move riot crate to armory, actually make it require armory access to unlock
* Localize planet names (borer)

* DatasetPrototype -> LocalizedDatasetPrototype

* Apply requested changes
* Initial commit

* Update based on maintainer discussion

* Forgot to remove this woops
* Add an Approved labeler for maintainer PRs

* Be extra safe with conditions
…stead of engi (#33417)

* Make a crew monitoring crate with flatpacks

* fix image

* migration
Hopefully without explosions yay
First commit

Co-authored-by: metalgearsloth <[email protected]>
* button

* implement populate grid view

* tweak min width

* Make grid button toggle visible

* tweak min window size

* fix missing recipe button when mirroring item

* make grid buttons toggleable

* align button texture vertically

* selected grid item has plain color background

* tweak window width so all buttons look good

* rename select method, defer colouring

* get icon better

* whoops

* simpler button toggle

* spritesys frame0, move spritesys

* delete old sprite system refs
@github-actions github-actions bot added Changes: Sprites Changes to sprites. Changes: Map Changes to map files. Changes: UI Changes to UI files. labels Nov 27, 2024
@LankLTE LankLTE merged commit 399e60a into master Nov 29, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map Changes to map files. Changes: Sprites Changes to sprites. Changes: UI Changes to UI files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.