Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Medical scrubs expansion #178

Open
wants to merge 14 commits into
base: master
Choose a base branch
from

Conversation

VMSolidus
Copy link
Contributor

@VMSolidus VMSolidus commented Sep 10, 2023

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
image
image (1)

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog
🆑 VMSolidus

  • remove: Scrubs can no longer be obtained from the MediDrobe
  • add: NT may have forgotten to check their MediDrobes for contraband
  • add: Eight different colors of scrubs and surgical caps can now be found in medical scrub crates!
  • add: Scrubs can now spawn in one of 8 exciting new colors. Please report sightings of a mysterious 9th color to management.(this needs to be mapped in)

@github-actions github-actions bot added Changes: Sprite Changes any png or json in an rsi No C# labels Sep 10, 2023
@github-actions
Copy link

github-actions bot commented Sep 10, 2023

RSI Diff Bot; head commit 807250e merging into d75b282
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 807250e

@Colin-Tel
Copy link
Contributor

I think it would be better to put the new scrubs into the medical scrubs crate (but keep the emag inventory).
Doing that would reduce the bloat in the medidrobe, while still allowing people to get the scrubs if they want. It also makes them more uncommon, making them cool outfits to either be mapped or just bring additional value to the medical scrubs crate.

@Carolyn3114
Copy link

I think it would be better to put the new scrubs into the medical scrubs crate (but keep the emag inventory). Doing that would reduce the bloat in the medidrobe, while still allowing people to get the scrubs if they want. It also makes them more uncommon, making them cool outfits to either be mapped or just bring additional value to the medical scrubs crate.

so true

removing scrubs from Medidrobe
Adding scrubs to scrubs crate, reducing amount of each scrub to 2 from 3
@VMSolidus
Copy link
Contributor Author

VMSolidus commented Sep 26, 2023

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
@VMSolidus
Copy link
Contributor Author

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.

@VMSolidus
Copy link
Contributor Author

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.
@VMSolidus
Copy link
Contributor Author

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

@VMSolidus
Copy link
Contributor Author

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.

Copy link
Contributor

@Colin-Tel Colin-Tel left a 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).

@github-actions github-actions bot added the Changes: YML Changes any yml files label Oct 4, 2023
@DEATHB4DEFEAT
Copy link
Member

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.

@VMSolidus
Copy link
Contributor Author

Tests failed for entirely unrelated reasons. I'd like to request a review and merge.

@Colin-Tel
Copy link
Contributor

Colin-Tel commented Oct 4, 2023

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.

image
:trollface:

Anyways I stand by the fact you should comment any changes on upstream files where possible.

@VMSolidus
Copy link
Contributor Author

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.

image :trollface:

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.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants