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

Cosmatic Drip 2 ~ Colours of Cargo (#396) #147

Merged
merged 10 commits into from
Jan 11, 2025

Conversation

Rosycup
Copy link
Contributor

@Rosycup Rosycup commented Jan 10, 2025

Description

Adds PR #396 from Cosmatic Drift

  • This PR focuses entirely on Cargo and Salvage, with a potential template for other departments in the form of the Departmental bandana. This PR also includes a near-full recolour of Cargo's "piss yellow" for a more pleasing yellow-brown colour.

Changelog

🆑

  • add: Ported uniforms and uniform colors for the Logistics department from Cosmatic Drift.

Copy link
Contributor

github-actions bot commented Jan 10, 2025

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

Resources/Textures/_CD/Clothing/Back/Backpacks/cargo.rsi

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

Resources/Textures/_CD/Clothing/Back/Duffels/cargo.rsi

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

Resources/Textures/_CD/Clothing/Back/Satchels/cargo.rsi

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

Resources/Textures/_CD/Clothing/Hands/Gloves/reinforced.rsi

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

Resources/Textures/_CD/Clothing/Head/Soft/cargosoft.rsi

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

Resources/Textures/_CD/Clothing/OuterClothing/Coats/cargo_bomber.rsi

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

Resources/Textures/_CD/Clothing/OuterClothing/Coats/foreman_coat.rsi

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

Resources/Textures/_CD/Clothing/OuterClothing/WinterCoats/coat.rsi

State Old New Status
CARGO-equipped-OUTERCLOTHING-vox Added
CARGO-equipped-OUTERCLOTHING Added
CARGO-icon Added
CARGO-inhand-left Added
CARGO-inhand-right Added

Resources/Textures/_CD/Clothing/Shoes/Boots/steeltoed_boots.rsi

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

Resources/Textures/_CD/Clothing/Shoes/Boots/winterbootscargo.rsi

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

Resources/Textures/_CD/Clothing/Uniforms/Jumpskirt/cargotech_dark.rsi

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

Resources/Textures/_CD/Clothing/Uniforms/Jumpskirt/cargotech_light.rsi

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

Resources/Textures/_CD/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi

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

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/cargotech_dark.rsi

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

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/cargotech_light.rsi

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

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/foreman.rsi

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

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/qmturtle.rsi

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

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/salvage.rsi

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

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/salvage_operator.rsi

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

Resources/Textures/_CD/Structures/Machines/VendingMachines/cargodrobe.rsi

State Old New Status
broken Added
normal-unshaded Added
off Added
panel Added

Edit: diff updated after b56c34d

@Rosycup
Copy link
Contributor Author

Rosycup commented Jan 11, 2025

Adding the gorka in by request.

@sleepyyapril sleepyyapril merged commit 04a0507 into TheDenSS14:master Jan 11, 2025
10 of 11 checks passed
sleepyyapril added a commit that referenced this pull request Jan 11, 2025
@Rosycup Rosycup deleted the cosmatic-drip branch January 12, 2025 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants