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] New closets #812

Merged
merged 1 commit into from
Nov 25, 2023
Merged

[MIRROR] New closets #812

merged 1 commit into from
Nov 25, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25167
Original PR: tgstation/tgstation#79774

closets_flat

closets_flat_1

In-game look

image

About The Pull Request

Resprites the existing closets and adds new ones.

TODO:

  • Resprite cabinets
  • Split wardrobe cabinets into unique closets
  • Add new sprites for some closets that use generic style as a fallback
  • Update the cursed closets and fridges for the new dimensions
  • Bio closet for medbay
  • Re-map some locker icons like chemistry, anasthetic...

Why It's Good For The Game

Making them in the same style as the crates.

Changelog

🆑 MTandi
fix: Emag overlay on lockers fixed
image: New locker sprites
image: Added new lockers
/:cl:


Also includes tgstation/tgstation#73331

* New closets

* Grammar checks every closet that spawns on a station. (#73331)

All closets now are called either closets, lockers, wardrobes etc. (e.g.
the lethal injections locker was previously called "lethal injections")
Head of staff and the cook's locker are no longer proper nouns, it
didn't make much grammatical sense and it keeps consistency with other
lockers (Example: detective's cabinet)
All locker names de-capitalized except the Thunderdome ones since those
made sense.
The empty freezer is now just called a freezer since it being empty or
not depends on what players and mappers do to it.
Tram now has evidence lockers labelled from 1 through 7 instead of 7
evidence lockers labelled as 1.

Changes have been made to all station maps and in code, I've not gone
through all ruins, away missions, etc.

Cleans up a lot  of minor name issues.
:cl:
spellcheck: All station closet and lockers have had their naming
conventions standardized.
fix: Tram now has evidence lockers labelled 1 through 7 instead of 7
evidence lockers labelled as locker 1.
/:cl:

* Removed Duplicates, Modularized Overrides.

* Added Base States, Removed Unused Icons

* Icon states

* Fix wall closets to not fail CI

---------

Co-authored-by: Andrew <[email protected]>
Co-authored-by: NamelessFairy <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
@Iajret Iajret merged commit b6753a4 into master Nov 25, 2023
24 of 25 checks passed
@Iajret Iajret deleted the upstream-mirror-25167 branch November 25, 2023 09:11
AnywayFarus added a commit that referenced this pull request Nov 25, 2023
Iajret pushed a commit that referenced this pull request Feb 7, 2024
)

* Science Xenos no longer turn the roundend report all bold (#81311)

## About The Pull Request

Fixes the 2% xeno's roundend report from turning the rest of the report
into bold letters.

## Why It's Good For The Game

look it's not all bold anymore

![image](https://github.com/tgstation/tgstation/assets/53777086/5b46dc02-5fb5-4d16-aedf-fc1c11aad045)

## Changelog

:cl:
fix: Science Xenos no longer turn the entire roundend report into bold
letters.
/:cl:

* Science Xenos no longer turn the roundend report all bold

---------

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