diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml index 741df155af0..cc841cc60d8 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml index 1f97f8abc2b..34a6bb85fcb 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index 846f7a9a050..01275ebc92e 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -55,5 +55,7 @@ minLimit: 1 maxLimit: 1 loadouts: - - SalvageJumpsuit - - SalvageJumpskirt + - ShaftMinerJumpsuit + - ShaftMinerJumpskirt # omu + - SalvageSpecialistJumpsuit # omu + - MilitarySalvageJumpsuit # omu diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml index 90c7f5a811f..c19b4d7baec 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml @@ -4,4 +4,4 @@ id: ClothingCargoDeltaV recipes: # Salvage - - ClothingUniformJumpskirtSalvageSpecialist + - ClothingUniformJumpskirtShaftMiner # omu diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml index ee7cca6e095..fd6016d57f6 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml @@ -2,5 +2,5 @@ - type: latheRecipe parent: BaseJumpsuitRecipe - id: ClothingUniformJumpskirtSalvageSpecialist - result: ClothingUniformJumpskirtSalvageSpecialist + id: ClothingUniformJumpskirtShaftMiner #omu + result: ClothingUniformJumpskirtShaftMiner #omu diff --git a/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml index 73d0166a1b0..0a27681c82f 100644 --- a/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml @@ -864,6 +864,7 @@ - !type:BuyerJobCondition whitelist: - SalvageSpecialist + - ShaftMiner # omu, i think goob forgot - type: listing id: UplinkGreyTide diff --git a/Resources/Prototypes/_Lavaland/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Lavaland/Loadouts/role_loadouts.yml index f8cb2361fb8..34f247dbf88 100644 --- a/Resources/Prototypes/_Lavaland/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_Lavaland/Loadouts/role_loadouts.yml @@ -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 diff --git a/Resources/Prototypes/_Lavaland/Roles/Jobs/Cargo/shaft_miner.yml b/Resources/Prototypes/_Lavaland/Roles/Jobs/Cargo/shaft_miner.yml index 4f58ba08a0c..cde1c205633 100644 --- a/Resources/Prototypes/_Lavaland/Roles/Jobs/Cargo/shaft_miner.yml +++ b/Resources/Prototypes/_Lavaland/Roles/Jobs/Cargo/shaft_miner.yml @@ -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: diff --git a/Resources/Prototypes/_Omu/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/_Omu/Loadouts/Jobs/Cargo/salvage_specialist.yml new file mode 100644 index 00000000000..e31f7f5a675 --- /dev/null +++ b/Resources/Prototypes/_Omu/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -0,0 +1,9 @@ +- type: loadout + id: MilitarySalvageJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitMilitarySalvageSpecialist + +- type: loadout + id: SalvageSpecialistJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitSalvageSpecialist \ No newline at end of file