-
Notifications
You must be signed in to change notification settings - Fork 53
Medical scrubs expansion #178
base: master
Are you sure you want to change the base?
Medical scrubs expansion #178
Conversation
RSI Diff Bot; head commit 807250e merging into d75b282 Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi
|
I think it would be better to put the new scrubs into the medical scrubs crate (but keep the emag inventory). |
so true |
removing scrubs from Medidrobe
Adding scrubs to scrubs crate, reducing amount of each scrub to 2 from 3
I have gone ahead and made the requested changes. Scrubs(except for the Cybersun/Syndicate scrubs, which are new cosmetic items found in MediDrobe's emag inventory) can instead be obtained from the Medical Scrub Crate. Since there's now 8 different kinds of scrubs in the crate, it has been slightly nerfed to only contain 1 of each scrub. I do still feel this is fair for its pricing, since it merely contains cosmetic items. If people want more of their favorite scrub color, they can always order the crate again from cargo. |
nerfing the count even more.
Adding a scrubs spawner for the mappers
Alright and now I have one more new addition to this PR. I've created a custom spawner for the mappers, so that these scrubs can be added as random spawns to station medbays. |
Also, I have an open question for the maintainers. Should the Cybersun Scrubs be emaggedInventory or contrabandInventory? The former makes them explicitly a traitor item, while the later requires that one only needs to hack the vendor to get them, such as with wire cutters or a multitool. |
Adding new scrubs to lockers. RNG is jank with this particular function
Some better approximations trying to get roughly 10% on everything but the cybersun scrubs. I don't know how many digits that PROB will accept, but just in case I rounded to only 2 decimal places.
Hold off on pulling this for a bit, Im still working on some things. The last thing Im adding is proper traitor uplink support for Cybersun drip, and awaiting input on some balancing stuff |
Okay, I'm going to request a review/pull on this now. I've decided that adding a new traitor uplink item to this PR is kind of outside scope. Especially since on my private branch, I'm working on an entire new system for traitor clothing bundles, which is MAJORLY outside scope for this particular branch. Therefore I will declare that this PR is complete. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From my POV, this looks good! If this were on the rebase, I'd approve it (as long as you made sure to comment on the upstream files you altered).
You can still approve PRs, you just won't affect mergeability. |
Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
Outdated
Show resolved
Hide resolved
Tests failed for entirely unrelated reasons. I'd like to request a review and merge. |
Anyways I stand by the fact you should comment any changes on upstream files where possible. |
It actually won't matter because we aren't merging this with rebase, and all these changes are going to be abandoned anyway whenever rebase is done. I have an equivalent PR in the works on rebase, but it's waiting on me getting off my ass and making the changes Wizden wants to their upstream. Guh that's so annoying. |
About the PR
This is adding six new scrub colors to the game for Medical mains to express themselves. One of which requires an Emag to access. They can be found in Medical Scrub cates, order some from Cargo! Or maybe station medbays might start getting stocked with them!
Media
Changelog
🆑 VMSolidus