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] [Modular] New Lockers! (Skyrat Edition) #999

Merged
merged 2 commits into from
Dec 7, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#25409

About The Pull Request

#25245 Redone because it deleted my everything when I pushed it. So, I redid it. All of it.

PR is essentially Skyrat-SS13/Skyrat-tg#25167 but for our own lockers, plus some other maintenance and a little surprise.

Full Changelist:

  • Removes redundant /station subtype of the NTC Locker (this is the source of all map changes)
  • Makes the formatting on the Barber's, NTC & Blueshield's Lockers/Garment Bags in line with all others (no more caps, no more \proper)
  • Moves the Sec Locker overrides to the master file
  • Removes the overrides on armory lockers, now that TG has cool ones for them that aren't redsec (they're green and have nifty icons)
  • Resprites the NTC, Blueshield, Sec, Warden, HoS, and Barber Lockers
  • NEW!: Wall Lockers can now be rebuilt, using 2 iron (same as building a normal closet, only this one makes a wallmount)
  • Wall Lockers are resprited, stored in their own .dmi so that they can have unique overlays
  • Several fixes/tweaks to Wall Lockers to prevent bugs

To-Do: Sort out why the wall lockers have bounce on the animated state. Done, animation is now smooth!

How This Contributes To The Skyrat Roleplay Experience

I love decrusting I love decrusting I love desouling I love desouling!!!!

Proof of Testing

Screenshots/Videos Security Lockers

image

Blueshield
image

NTC
image

Barber (God that vendor needs to be redone)
image

Wall Lockers are now not only up-to-date... (these images are a tinyyy bit outdated tho. I made them like 1px shorter and cleaned the inside's shading a bit)
image

And have working overlays...
image

But can be re-built and mounted!
image

Changelog

🆑 OrionTheFox
qol: Wall Lockers can now be rebuilt! The wall mounts can be crafted the same as a default closet, with 2 iron in-hand.
image: resprites (almost) all Skyrat lockers, including wall-mounted ones! They should be much more in line with TG's sprites now.
fix: fixed several bugs with wall-mounted lockers, and formatting inconsistencies of modular lockers
/:cl:

* moves sec lockers to use modular file

* Removes redundant /station subtype from NTC Locker

* consistency with other stuff + its converted now (YOU'RE THE LAZY ASSHAT, ASSHAT.)

* blueshield consistency with other lockers/bags

* resprite all the modular closets (that I'm willing to do)

* stop being mean. Asshat.

* Resprites wall lockers (separate file so they can have working overlays)

* Even if these don't work here's the icons so I don't lose them (again)

* Wall mounts can be rebuilt! Yahoo!

* oh I should probably push these whoops

* fixes animations

* removes an EVIL icon override we had buried
@Iajret Iajret merged commit 36908ce into master Dec 7, 2023
22 checks passed
@Iajret Iajret deleted the upstream-mirror-25409 branch December 7, 2023 11:14
AnywayFarus added a commit that referenced this pull request Dec 7, 2023
Iajret pushed a commit that referenced this pull request Feb 17, 2024
* Salicylic acid & Oxandrolone now care about purity. (#81191)

## About The Pull Request
Just makes salicylic acid and oxandrolone scale with purity (so they're
consistent with libital & aiuri scaling)
## Why It's Good For The Game
Now mass producing good salicylic acid / oxandrolone with a chem factory
takes some effort.

## Changelog

:cl:
balance: Oxandrolone now scales with purity. Its default purity is 100%
balance: Salicylic acid now scales with purity. Its default purity is
100%
/:cl:

* Salicylic acid & Oxandrolone now care about purity.

---------

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