Security resprite and loadout revision #1273

TadJohnson00 · 2024-05-30T03:42:07Z

About the PR

Resprited detective gear as well as some other security and security-adjacent equipment, tweaked security's loadouts so they make sense. See #1197 for further details.

Why / Balance

For consistency in uniform. Mild balance changes were made with regards to replacement of warden's and HoS' jackets with standard coats, see PR #1197.

Technical details

n/a

Media

Please see #1197 for further media.

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

Breaking changes

Changelog

🆑

add: New security outer clothing for all security roles, as well as proper senior security officers' and cadets' jumpsuits.
add: Jetpacks are now available in all security suit storage. Thank goodness for increased funding.
tweak: Revamped security's clothing and equipment options; all gear is now up to code, and no further outdated equipment will be issued. This includes, most notably, the detective's uniform, which has received a whole makeover.
fix: Fixed security hardsuits not allowing you to turn on internals without a mask.
remove: Head of security's winter coat, warden's winter coat, security winter coat, security departmental winter boots, WizDen-pattern body armour, and some other minor changes necessary for respriting.

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

Remove jumpskirt issue? Signed-off-by: Tad "Taddy" Johnson <[email protected]>

…WizVelta into secrespritefinally

github-actions · 2024-05-30T03:42:49Z

RSI Diff Bot; head commit fe557ea merging into 353eb66
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 fe557ea

DangerRevolution · 2024-05-30T10:20:33Z

This needs a change log

TadJohnson00 · 2024-05-30T12:30:07Z

Is the one in #1197 not sufficient?

DangerRevolution · 2024-05-30T13:43:32Z

Is the one in #1197 not sufficient?

no, the bot doesn't see that PR and won't see it's changelog

TadJohnson00 · 2024-05-30T14:18:54Z

Got it, should be fixed now.

DangerRevolution

needs delta-v comments, needs more changelog entries, some of the uniforms need to be reparented appropriately instead of rehashing the same components

Resources/Prototypes/Catalog/Fills/Items/belt.yml

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

Resources/Prototypes/Loadouts/loadout_groups.yml

Resources/Prototypes/Loadouts/role_loadouts.yml

github-actions · 2024-06-01T21:45:38Z

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

IamVelcroboy · 2024-06-07T21:48:16Z

@TadJohnson00 you mentioned that if/when this is loaded it would be able to play into the Hammurabi Warden needs. Is that still the case? Or should I be seeking out sprites form out contributors?

TadJohnson00 · 2024-06-13T11:08:40Z

@TadJohnson00 you mentioned that if/when this is loaded it would be able to play into the Hammurabi Warden needs. Is that still the case? Or should I be seeking out sprites form out contributors?

That's pretty much the case. The roles, their mechanical functionality, and their appearances will be almost identical, but I'll follow this up with a PR that actually defines the role itself.

IamVelcroboy · 2024-06-13T12:36:06Z

That's pretty much the case. The roles, their mechanical functionality, and their appearances will be almost identical, but I'll follow this up with a PR that actually defines the role itself.

I already have all that ready here. I just need the textures to complete it.

Tweaked some role items, added comments, etc.

TadJohnson00 · 2024-06-13T14:53:30Z

Should be all set, and ready for review.

TadJohnson00 · 2024-06-13T16:01:41Z

That's pretty much the case. The roles, their mechanical functionality, and their appearances will be almost identical, but I'll follow this up with a PR that actually defines the role itself.

I already have all that ready here. I just need the textures to complete it.

I'll make sure to work on a few RSIs for ya then. I can get you a jumpsuit, PDA, ID, and job icon, and some outerclothing if you think it's necessary.

And for what it's worth, I think the role of "Armorer" is more fitting than "Armory Commander", but that's not my call to make.

github-actions · 2024-06-17T18:02:28Z

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

TadJohnson00 · 2024-06-20T11:37:48Z

I can fix the merge conflict easily enough. Is everything else all good to go?

Lyndomen · 2024-06-20T19:52:35Z

Jail guard? :godo:

TadJohnson00 · 2024-06-20T20:31:30Z

After this gets merged I'll do jail guard and armourer

github-actions · 2024-07-09T00:09:27Z

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

Signed-off-by: Tad "Taddy" Johnson <[email protected]>

ghost

Approving this with intent of merging; one caveat though - TJ, in a future PR, please add back a way to access the old detective coats / greatcoat that you removed in this PR. That is my one nitpick. Uniform printer or hacking the DetDrobe or SecDrobe or something works.

TadJohnson00 and others added 13 commits May 15, 2024 16:24

Finish Security Resprite

63c1ecc

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

Fixed erroneous second formal sec jumpskirt entry

a27937c

Add extra sunglasses to sectech

f82a1bd

Merge remote-tracking branch 'upstream/master' into secrespritefinally

4e58a7b

Adjust sec resprite for loadouts

30cf57b

Merge branch 'master' into secrespritefinally

909f502

Update security_cadet.yml

03ba4cb

Remove jumpskirt issue? Signed-off-by: Tad "Taddy" Johnson <[email protected]>

Merge branch 'master' into secrespritefinally

ff6ebc5

Merge branch 'master' into secrespritefinally

b36eeb4

Merge branch 'master' into secrespritefinally

fc6c249

Merge remote-tracking branch 'upstream/master' into secrespritefinally

fa04153

Merge branch 'secrespritefinally' of https://github.com/TadJohnson00/…

38f48d9

…WizVelta into secrespritefinally

Update coats.yml

364df73

github-actions bot added Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels May 30, 2024

TadJohnson00 added 2 commits May 30, 2024 18:16

Merge branch 'master' into secrespritefinally

68af90e

Merge branch 'master' into secrespritefinally

562a13f

DangerRevolution reviewed May 30, 2024

View reviewed changes

github-actions bot added the Status: Merge Conflict Fix your PR! label Jun 1, 2024

Merge remote-tracking branch 'upstream/master' into secrespritefinally

8a20e6c

github-actions bot removed the Status: Merge Conflict Fix your PR! label Jun 13, 2024

TadJohnson00 added 4 commits June 13, 2024 23:50

Finetune security loadouts

4729c11

Tweaked some role items, added comments, etc.

Removed duplicate mentions

7fde508

Further finetuning

a542300

Fix typo

f4fd660

TadJohnson00 mentioned this pull request Jun 14, 2024

Added Station Security Sweater to SecDrobe and Loadout #1382

Closed

1 task

github-actions bot added the Status: Merge Conflict Fix your PR! label Jun 17, 2024

Merge remote-tracking branch 'upstream/master' into secrespritefinally

d6079d0

github-actions bot removed the Status: Merge Conflict Fix your PR! label Jun 28, 2024

Merge branch 'master' into secrespritefinally

c2302ef

This comment was marked as spam.

Sign in to view

github-actions bot added the Status: Merge Conflict Fix your PR! label Jul 9, 2024

Merge branch 'master' into secrespritefinally

fe557ea

Signed-off-by: Tad "Taddy" Johnson <[email protected]>

github-actions bot removed the Status: Merge Conflict Fix your PR! label Jul 13, 2024

This comment was marked as spam.

Sign in to view

ghost approved these changes Jul 15, 2024

View reviewed changes

ghost merged commit 216a3f1 into DeltaV-Station:master Jul 15, 2024
13 checks passed

NullWanderer mentioned this pull request Jul 21, 2024

Revert "Security resprite and loadout revision" #1517

Merged

TadJohnson00 deleted the secrespritefinally branch August 1, 2024 23:47

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Security resprite and loadout revision #1273

Security resprite and loadout revision #1273

TadJohnson00 commented May 30, 2024 •

edited

Loading

github-actions bot commented May 30, 2024 •

edited

Loading

DangerRevolution commented May 30, 2024

TadJohnson00 commented May 30, 2024

DangerRevolution commented May 30, 2024

TadJohnson00 commented May 30, 2024

DangerRevolution left a comment

github-actions bot commented Jun 1, 2024

IamVelcroboy commented Jun 7, 2024

TadJohnson00 commented Jun 13, 2024

IamVelcroboy commented Jun 13, 2024

TadJohnson00 commented Jun 13, 2024

TadJohnson00 commented Jun 13, 2024

github-actions bot commented Jun 17, 2024

TadJohnson00 commented Jun 20, 2024

Lyndomen commented Jun 20, 2024

TadJohnson00 commented Jun 20, 2024

This comment was marked as spam.

github-actions bot commented Jul 9, 2024

This comment was marked as spam.

ghost left a comment

Security resprite and loadout revision #1273

Security resprite and loadout revision #1273

Conversation

TadJohnson00 commented May 30, 2024 • edited Loading

About the PR

Why / Balance

Technical details

Media

Breaking changes

github-actions bot commented May 30, 2024 • edited Loading

DangerRevolution commented May 30, 2024

TadJohnson00 commented May 30, 2024

DangerRevolution commented May 30, 2024

TadJohnson00 commented May 30, 2024

DangerRevolution left a comment

Choose a reason for hiding this comment

github-actions bot commented Jun 1, 2024

IamVelcroboy commented Jun 7, 2024

TadJohnson00 commented Jun 13, 2024

IamVelcroboy commented Jun 13, 2024

TadJohnson00 commented Jun 13, 2024

TadJohnson00 commented Jun 13, 2024

github-actions bot commented Jun 17, 2024

TadJohnson00 commented Jun 20, 2024

Lyndomen commented Jun 20, 2024

TadJohnson00 commented Jun 20, 2024

This comment was marked as spam.

github-actions bot commented Jul 9, 2024

This comment was marked as spam.

ghost left a comment

Choose a reason for hiding this comment

TadJohnson00 commented May 30, 2024 •

edited

Loading

github-actions bot commented May 30, 2024 •

edited

Loading