DeltaV-Station / Delta-v-Legacy

A fork of Space Station 14, embracing a mixture of classic SS13 chaos and experimentation only possible with the new engine
https://www.delta-v.org
MIT License
12 stars 53 forks source link

Medical scrubs expansion #178

Open VMSolidus opened 1 year ago

VMSolidus commented 1 year ago

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)

Changelog :cl: VMSolidus

github-actions[bot] commented 1 year ago

RSI Diff Bot; head commit 807250efc468a89ee29398e9247fcc832109de8b merging into d75b282f93b2f22d450fa523c9d76fcd560a1d39 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 | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/evilexecutive/Delta-v/807250efc468a89ee29398e9247fcc832109de8b/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/inhand-right.png) | Added

Edit: diff updated after 807250efc468a89ee29398e9247fcc832109de8b

Colin-Tel commented 1 year ago

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 commented 1 year ago

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

VMSolidus commented 1 year ago

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.

VMSolidus commented 1 year ago

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 commented 1 year ago

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.

VMSolidus commented 1 year ago

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 commented 1 year ago

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.

DEATHB4DEFEAT commented 1 year ago

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 commented 1 year ago

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

Colin-Tel commented 1 year ago

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 commented 1 year ago

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.