Skip to content

Commit

Permalink
Cosmatic Drip 2 ~ Colours of Cargo (#396) (#147)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

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

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

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

---------

Co-authored-by: KittenColony <[email protected]>
Co-authored-by: sleepyyapril <[email protected]>
  • Loading branch information
3 people authored Jan 11, 2025
1 parent 1160a4b commit 04a0507
Show file tree
Hide file tree
Showing 138 changed files with 1,593 additions and 703 deletions.
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- id: QuartermasterIDCard # Delta-V
- id: AstroNavCartridge
- id: ClothingLongcoatLO # Floofstation
- id: ClothingOuterCoatCargoBomber # CD
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: CargoTechFabCircuitboard # Floof - port to EE if possible
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@
- type: StorageFill
contents:
- id: ClothingHeadHatCargosoft
- id: ClothingUniformJumpsuitCargo
- id: ClothingUniformJumpsuitCargoLight # CD
- id: ClothingBackpack
- id: ClothingShoesColorBlack
- id: ClothingUniformJumpskirtCargo
- id: ClothingUniformJumpskirtCargoLight # CD
- id: ClothingHandsGlovesFingerless
- id: AppraisalTool

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,24 @@
ClothingBackpackCargo: 3
ClothingBackpackSatchelCargo: 3
ClothingBackpackDuffelCargo: 3
ClothingUniformJumpsuitCargo: 3
ClothingUniformJumpskirtCargo: 3
ClothingUniformJumpsuitCargoLight: 3 # CD
ClothingUniformJumpsuitCargoDark: 3 # CD
ClothingUniformJumpskirtCargoLight: 3 # CD
ClothingUniformJumpskirtCargoDark: 3 # CD
# ClothingUniformJumpsuitCargoPants: 3 # CD
ClothingShoesColorBlack: 3
ClothingHandsGlovesFingerless: 3
ClothingHandsGlovesMechanic: 3 # CD
ClothingHeadHatCargosoft: 3
ClothingHeadBandBrown: 3
# ClothingMaskBandCargo : 3 # CD
ClothingHeadsetCargo: 3
ClothingOuterWinterCargo: 2
ClothingOuterWinterMiner: 2
ClothingOuterCoatCargoBomber: 2 # CD
ClothingNeckScarfStripedBrown: 3
ClothingShoesBootsWinterCargo: 2
ClothingShoesBootsSteel: 2 # CD
ClothingNeckCollarLogi: 1 # Floofstation - Collar addition
ClothingHandsLogisWarmers: 1 # Floofstation
ClothingUnderSocksLogis: 1 # Floofstation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@
# maxItems: 1
# items:
#
#- type: characterItemGroup
# id: LoadoutLogisticsOfficerOuter
# maxItems: 1
# items:
#
- type: characterItemGroup
id: LoadoutLogisticsOfficerOuter
maxItems: 1
items:
- type: loadout
id: LoadoutCommandQMOuterCoatCargoForeman

- type: characterItemGroup
id: LoadoutLogisticsOfficerShoes
maxItems: 1
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
description: A robust backpack for stealing logistics's loot. # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/cargo.rsi
sprite: _CD/Clothing/Back/Backpacks/cargo.rsi # CD drip 2

- type: entity
parent: ClothingBackpack
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Back/duffel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
description: A large duffel bag for stealing logistics's precious loot. # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Back/Duffels/cargo.rsi
sprite: _CD/Clothing/Back/Duffels/cargo.rsi # CD drip 2

- type: entity
parent: ClothingBackpackDuffel
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Back/satchel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
description: A robust satchel for stealing logistics's loot. # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Back/Satchels/cargo.rsi
sprite: _CD/Clothing/Back/Satchels/cargo.rsi # CD drip 2

- type: entity
parent: ClothingBackpackSatchel
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/soft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
description: "It's a baseball hat painted in Logistics colours." # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Head/Soft/cargosoft.rsi
sprite: _CD/Clothing/Head/Soft/cargosoft.rsi # CD drip 2
- type: Clothing
sprite: Clothing/Head/Soft/cargosoft.rsi
sprite: _CD/Clothing/Head/Soft/cargosoft.rsi # CD drip 2
- type: Tag
tags:
- ClothMade
Expand Down
Loading

0 comments on commit 04a0507

Please sign in to comment.