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

Alternate Corporate Coats Wave 1 #392

Merged
merged 12 commits into from
May 22, 2024

Conversation

LovelyLophi
Copy link
Member

Description

Edited the corporate coat by Leonardo DaBepis,

Thought we could have some more options for assistant gang colors. /j


Media

image

WAOW THEY LOOK SO COOOL RIGHT?


Changelog

🆑

  • add: Added a number of new corporate coats to the Clothesmate.

@github-actions github-actions bot added Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels May 4, 2024
Copy link
Contributor

github-actions bot commented May 4, 2024

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

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

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

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

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

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

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

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

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

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

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Edit: diff updated after f6d2035

@LovelyLophi
Copy link
Member Author

I see the failure, give me a moment.

Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

Very cool, they look nice; just a question on the meta.json's and

Going to ask for these to be localized in .ftl, which lets downstreams alter the descriptions of these without making merge conflicts for purposes such as translation for our Ukranian fork and altering the description for Syndicate-focused fork so it makes sense in their lore.

ClothingOuterEECorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterHICorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterHMCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterIdCorporateJacket: 2 # Einstein Engines - Clothing addition
Copy link
Contributor

Choose a reason for hiding this comment

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

Tags are fine here as it's in the middle of many other non-Wiz clothes.

{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr",
Copy link
Contributor

@DangerRevolution DangerRevolution May 4, 2024

Choose a reason for hiding this comment

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

Did you draw this or did Leo?

Copy link
Member Author

Choose a reason for hiding this comment

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

Leo created the original jacket, I merely edited them to match the color schemes

Copy link
Contributor

Choose a reason for hiding this comment

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

you need to credit yourself for the edit

@LovelyLophi
Copy link
Member Author

Very cool, they look nice; just a question on the meta.json's and

Going to ask for these to be localized in .ftl, which lets downstreams alter the descriptions of these without making merge conflicts for purposes such as translation for our Ukranian fork and altering the description for Syndicate-focused fork so it makes sense in their lore.

@DangerRevolution I have no idea how to do FTL files so I think I'll leave that for other people if they want to pick this up. I'd prefer if there were some solid requirements for what a PR needs that I could read somewhere.

@DangerRevolution
Copy link
Contributor

Very cool, they look nice; just a question on the meta.json's and
Going to ask for these to be localized in .ftl, which lets downstreams alter the descriptions of these without making merge conflicts for purposes such as translation for our Ukranian fork and altering the description for Syndicate-focused fork so it makes sense in their lore.

@DangerRevolution I have no idea how to do FTL files so I think I'll leave that for other people if they want to pick this up. I'd prefer if there were some solid requirements for what a PR needs that I could read somewhere.

Very real, localisation should probably be done by script when that's made one day. Standards are something we still have to decide on really, not really sure.

@DangerRevolution
Copy link
Contributor

if you fix the credit by adding your name in i'll approve the review

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

github-actions bot commented May 5, 2024

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

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label May 6, 2024
@github-actions github-actions bot added the Status: Needs Review Someone please review this label May 18, 2024
@DangerRevolution DangerRevolution enabled auto-merge (squash) May 18, 2024 10:03
Copy link
Member

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

👍

Just make sure all the tests passes.

@DangerRevolution
Copy link
Contributor

👍

Just make sure all the tests passes.

they pass, just a microsoft issue

@Pspritechologist Pspritechologist merged commit 8d6c536 into Simple-Station:master May 22, 2024
8 of 12 checks passed
SimpleStation14 added a commit that referenced this pull request May 22, 2024
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 Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants