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

CorporatCoatsWavetwo #426

Merged
merged 17 commits into from
Jun 2, 2024
Merged

Conversation

LovelyLophi
Copy link
Member

@LovelyLophi LovelyLophi commented May 31, 2024

Description

Further expanded Assistant gang colors and added them to loadouts

VM is bad at helping so image is in comments

Changelog

🆑

  • add: Added five new coats
  • add: Added loadouts
  • fix: Fixed the coat handhole

@github-actions github-actions bot added Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels May 31, 2024
@LovelyLophi LovelyLophi changed the title Coatmaxxing CorporatCoatsWavetwo May 31, 2024
Copy link
Contributor

github-actions bot commented May 31, 2024

RSI Diff Bot; head commit d9aee01 merging into 00b0d9e
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 Modified

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

State Old New Status
equipped-OUTERCLOTHING Modified

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

State Old New Status
equipped-OUTERCLOTHING Modified

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

State Old New Status
equipped-OUTERCLOTHING Modified

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

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

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

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

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

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

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

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

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

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

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

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Edit: diff updated after d9aee01

@VMSolidus VMSolidus marked this pull request as ready for review May 31, 2024 03:03
@VMSolidus VMSolidus marked this pull request as draft May 31, 2024 03:03
@VMSolidus
Copy link
Member

image
Very nice

@LovelyLophi LovelyLophi marked this pull request as ready for review May 31, 2024 03:13
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.

Fix linter and it's good to go

@DangerRevolution DangerRevolution enabled auto-merge (squash) May 31, 2024 10:03
auto-merge was automatically disabled May 31, 2024 16:03

Head branch was pushed to by a user without write access

Fixes Arbitrage by lowering coat prices.
@VMSolidus VMSolidus merged commit 6d3e078 into Simple-Station:master Jun 2, 2024
12 checks passed
SimpleStation14 added a commit that referenced this pull request Jun 2, 2024
@DEATHB4DEFEAT
Copy link
Member

Terrible name

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants