Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtSalvageSpecialist
name: salvage specialist's jumpskirt
id: ClothingUniformJumpskirtShaftMiner # Omu they added shaft miner
name: shaft miner's jumpskirt # omu
description: It's a snappy jumpsuit with a sturdy skirt. It's very dirty.
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Jumpsuit
- type: loadout
id: SalvageJumpskirt
id: ShaftMinerJumpskirt # omu, the id is different now
equipment:
jumpsuit: ClothingUniformJumpskirtSalvageSpecialist
jumpsuit: ClothingUniformJumpskirtShaftMiner
groupBy: "jumpskirt" # Omu

- type: loadout
id: SalvageJumpsuit
id: ShaftMinerJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
jumpsuit: ClothingUniformJumpsuitShaftMiner # omu
groupBy: "jumpsuit" # Omu
6 changes: 4 additions & 2 deletions Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,7 @@
minLimit: 1
maxLimit: 1
loadouts:
- SalvageJumpsuit
- SalvageJumpskirt
- ShaftMinerJumpsuit
- ShaftMinerJumpskirt # omu
- SalvageSpecialistJumpsuit # omu
- MilitarySalvageJumpsuit # omu
2 changes: 1 addition & 1 deletion Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
id: ClothingCargoDeltaV
recipes:
# Salvage
- ClothingUniformJumpskirtSalvageSpecialist
- ClothingUniformJumpskirtShaftMiner # omu
4 changes: 2 additions & 2 deletions Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

- type: latheRecipe
parent: BaseJumpsuitRecipe
id: ClothingUniformJumpskirtSalvageSpecialist
result: ClothingUniformJumpskirtSalvageSpecialist
id: ClothingUniformJumpskirtShaftMiner #omu
result: ClothingUniformJumpskirtShaftMiner #omu
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,7 @@
- !type:BuyerJobCondition
whitelist:
- SalvageSpecialist
- ShaftMiner # omu, i think goob forgot

- type: listing
id: UplinkGreyTide
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/_Lavaland/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
- type: roleLoadout
id: JobShaftMiner
groups:
- SalvageSpecialistJumpsuit # Omu
- GroupTankHarness
- SalvageSpecialistNeck # TODO add a special cloak specifically for shaft miners
- SalvageSpecialistBackpack
- SalvageSpecialistOuterClothing
- SalvageSpecialistShoes
- CargoShoes
- Glasses
- Survival
- Trinkets
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
- type: startingGear
id: ShaftMinerGear
equipment:
jumpsuit: ClothingUniformJumpsuitShaftMiner
# jumpsuit: ClothingUniformJumpsuitShaftMiner # omu, im giving shaft miners the salv drip and vice versa yay
id: MinerPDA
ears: ClothingHeadsetCargo
storage:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: loadout
id: MilitarySalvageJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitMilitarySalvageSpecialist

- type: loadout
id: SalvageSpecialistJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
Loading