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

Blue Security #51

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Blue Security #51

wants to merge 1 commit into from

Conversation

Pspritechologist
Copy link
Member

blu

Any blue Sec sprite that hasn't been updated to a new sprite upstream. There are still *so* many sprites to do, and this doesn't include anything other than sprites, such as the prototypes we have (bandana, etc.)
@github-actions github-actions bot added the Changes: Sprite Changes any png or json in an rsi label Feb 12, 2024
Copy link
Contributor

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

Resources/Textures/Clothing/Back/Backpacks/security.rsi

State Old New Status
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Back/Duffels/security.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Clothing/Back/Satchels/security.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Belt/security.rsi

State Old New Status
equipped-BELT Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Belt/securitywebbing.rsi

State Old New Status
equipped-BELT Modified
icon Modified

Resources/Textures/Clothing/Ears/Headsets/security.rsi

State Old New Status
icon Modified
icon_alt Modified

Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi

State Old New Status
icon Modified

Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi

State Old New Status
equipped-EYES Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Eyes/Hud/sec.rsi

State Old New Status
equipped-EYES Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi

State Old New Status
icon Modified
off-equipped-HELMET Modified
off-inhand-left Modified
off-inhand-right Modified
on-equipped-HELMET Modified
on-inhand-left Modified
on-inhand-right Modified

Resources/Textures/Clothing/Head/Soft/secsoft.rsi

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

Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi

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

Resources/Textures/Clothing/Neck/Bedsheets/hos.rsi

State Old New Status
equipped-NECK Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon-open Modified
icon Modified
inhand-left Modified
inhand-right Modified
open-equipped-OUTERCLOTHING Modified
open-inhand-left Modified
open-inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi

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

Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi

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

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

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

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

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

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

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

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

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi

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

Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi

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

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

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified

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

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi

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

Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi

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

Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/Head/Bandanas/lightblue.rsi

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

Resources/Textures/Clothing/Head/Hats/beret_sec.rsi

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

@Pspritechologist
Copy link
Member Author

This currently includes any blue Sec sprite that hasn't been updated to a new sprite upstream. There are still so many sprites to do, and this doesn't include anything other than sprites, such as the prototypes we have (bandanna, soft cap, etc.)

@DEATHB4DEFEAT DEATHB4DEFEAT mentioned this pull request Feb 12, 2024
75 tasks
Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

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

It would probably be better to do this by adding new items, and replacing instances of upstream sec items with bluesec items. I haven't submitted the "Small Feature Requests" issue tracker to EE yet, but one of the things I had intended to submit there was adding bluesec items to EE, but as separate items. So that server hosts can simply change the loadout options for security to include their preferred sec colors.

@Pspritechologist
Copy link
Member Author

Pspritechologist commented Apr 18, 2024

It would probably be better to do this by adding new items, and replacing instances of upstream sec items with bluesec items. I haven't submitted the "Small Feature Requests" issue tracker to EE yet, but one of the things I had intended to submit there was adding bluesec items to EE, but as separate items. So that server hosts can simply change the loadout options for security to include their preferred sec colors.

That would be both a lot of item bloat, and a huge pain for a downstream to actually swap out. If you're determined to support both states yourself, I'd suggest just maintaining a sprite pack that can be easily dropped in to replace all instances. Could host it in a repo, downloaded as a zip you'd just need to extract it an boom, sprites swapped.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 3, 2024
Copy link
Contributor

github-actions bot commented Jun 3, 2024

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Status: Merge Conflict FIX YOUR PR AAAGH
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants