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

Cargo clothing updates #2970

Merged
merged 11 commits into from
Feb 20, 2025
Merged

Conversation

Aikakakah
Copy link
Contributor

About the PR

Added the new cargo clothing to the vend and added a folded jumpsuit sprite to the new cargo pants uniform.

Why / Balance

Players get more options for drip.

Technical details

Changed drobe files and some yml.

Media

image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

No breaking changes

Changelog

  • fix: New cargo uniforms are now in the LogiDrobe!

@Aikakakah Aikakakah requested review from a team as code owners February 12, 2025 20:30
@github-actions github-actions bot added S: Needs Review size/XS Under 16 lines Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi labels Feb 12, 2025
Copy link
Contributor

github-actions bot commented Feb 12, 2025

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

Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Edit: diff updated after ad8df69

@ThataKat
Copy link
Contributor

Direction reviewing, get back to you in a day or so

deltanedas
deltanedas previously approved these changes Feb 13, 2025
@ThataKat
Copy link
Contributor

Direction here, requesting that the salvage boots are removed from the LO loadout, but besides that good to go!

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 S: Merge Conflict Fix your PR! label Feb 15, 2025
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Feb 15, 2025
@Aikakakah Aikakakah requested a review from deltanedas February 19, 2025 21:56
@deltanedas deltanedas merged commit 48258bd into DeltaV-Station:master Feb 20, 2025
18 checks passed
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 S: Needs Review size/XS Under 16 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants