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.

Sign up for GitHub

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
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5fb5815
Cosmatic Drip 2 ~ Colours of Cargo (#396)
KittenColony Sep 21, 2024
ae6c1c0
ack
Rosycup Jan 10, 2025
3c3f0ab
linter fix
Rosycup Jan 10, 2025
b0b8816
another fix
Rosycup Jan 10, 2025
728ac7b
woof
Rosycup Jan 10, 2025
6c077c0
were back to it
Rosycup Jan 11, 2025
11c32df
eventually this will work
Rosycup Jan 11, 2025
46dec27
Cargo Gorka
Rosycup Jan 11, 2025
9690d9e
salvage jumpsuit loadout addition
Rosycup Jan 11, 2025
b56c34d
Merge branch 'master' into cosmatic-drip
sleepyyapril Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
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
View file
Open in desktop
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
11 changes: 9 additions & 2 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
View file
Open in desktop
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
12 changes: 7 additions & 5 deletions Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading