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

Finish Security Resprite #1197

Closed

Conversation

TadJohnson00
Copy link
Contributor

@TadJohnson00 TadJohnson00 commented May 15, 2024

The long-awaited second half should make Delta-V security almost fully distinct from WizDen.

About the PR

Finished respriting security, including detective, warden, cadets, senior officers - etc.

Why / Balance

Was always intended from the first resprite, in an attempt to make Delta-V security more visually distinct, interesting, and g r i t t i e r.

Some mild changes to balance with the coats, other than that should all be normal.

Technical details

Media

image
image
image

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

Breaking changes

Changelog

🆑 TJohnson

  • tweak: Security uniforms have received their second awaited update. Old-pattern uniforms are almost fully phased out.

The long-awaited second half should make Delta-V security almost fully distinct from WizDen.
@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi labels May 15, 2024
Copy link
Contributor

github-actions bot commented May 15, 2024

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-right Modified

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/Clothing/Mask/joy.rsi

State Old New Status
equipped-MASK-vulpkanin Added

Resources/Textures/Clothing/Mask/neckgaiter.rsi

State Old New Status
equipped-MASK-vulpkanin Added

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

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

Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi

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

Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi

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

Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi

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

Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi

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

Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/secformal.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_cadet.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_tactical.rsi

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

Edit: diff updated after fc6c249

@Timemaster99
Copy link
Contributor

Does this include the senior officer gear coming up in the loadouts merge?

@TadJohnson00
Copy link
Contributor Author

ehh? fuck's with the central package version manager??

@TadJohnson00
Copy link
Contributor Author

Does this include the senior officer gear coming up in the loadouts merge?

It does include senior officer gear, which will need to be incorporated into the loadouts merge.

When this PR goes through I'll address security's loadouts.

@NullWanderer NullWanderer added the Status: Do Not Merge Don't merge this yet label May 15, 2024
@DangerRevolution
Copy link
Contributor

ehh? fuck's with the central package version manager??

wizden issue, if you see all the items appear in game it's a good sign

@TadJohnson00
Copy link
Contributor Author

Well, I can give you the classic "works on my machine lol"

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label May 15, 2024
@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label May 15, 2024
@github-actions github-actions bot added the Changes: Localization Changes any ftl files label May 15, 2024
@TadJohnson00
Copy link
Contributor Author

winning a little too hard today

Remove jumpskirt issue?

Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
@TadJohnson00
Copy link
Contributor Author

More wizden based issues?

@TadJohnson00
Copy link
Contributor Author

Yep, looks like they're the same errors as on the vulp overlay removal. Works fine on my machine.

Sooner this gets merged, sooner I can fix other parts of the loadout system (mostly deprecated wizden items being used instead of delta-v items)

@TadJohnson00
Copy link
Contributor Author

Just let me know if this needs discussion or changes prior to merge, I can address both as necessary.

@NullWanderer
Copy link
Contributor

This will be reviewed when someone gets to it

@DeltaV-Station DeltaV-Station locked as off-topic and limited conversation to collaborators May 18, 2024
@NullWanderer NullWanderer removed the Status: Do Not Merge Don't merge this yet label May 18, 2024
@DeltaV-Station DeltaV-Station unlocked this conversation May 18, 2024
Copy link
Contributor

@NullWanderer NullWanderer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The yaml changes seem fine so far, I'll do a more in depth review in a few days if no other maintainer gets it done first

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a look at this even though it's closed (AND!! I'm not a maintainer, just some random fucking contrib), most of the changes themselves are to sprites and YML files. This is good to merge as it appears on the surface and most of the new files it introduces and integrates, AND changes are sprites. You are free to un-close it and merge it.
One thing that I will note is it does get rid of the detective clothes and greatcoat as gear from the DetDrobe and SecDrobe as an option in favor of the Forensic Specialist gear added in this PR, so if anyone wants them back there, they'll have to add them alongside the stuff here.

@TadJohnson00
Copy link
Contributor Author

Trench coats + noir suits + fedoras were intended to be removed in favour of detectives having actual uniforms that make sense. As for the greatcoat, it's still in the sec drobe, just locked behind the manager wire.

@rosieposieeee
Copy link
Contributor

at least keep the old det stuff for loadouts :( its fun

@TadJohnson00
Copy link
Contributor Author

If it was possible to sign comments on GitHub mine would be "TJ, Antithesis of Fun"

@Timemaster99
Copy link
Contributor

Why was this closed? Is it still going to be reviewed?

@TadJohnson00
Copy link
Contributor Author

If this isn't reopened by the time I get around to it, I'll just open a new PR from the same branch. This change does need to get merged eventually, having it closed contributes nothing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files 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.

5 participants