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

Replace Salvage Jumpsuit sprite instead of adding a new item #137

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Replace Salvage Jumpsuit sprite instead of adding a new item #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d60abf
Replace sprite
FluffiestFloof Oct 9, 2023
13e1e3c
Merge branch 'DeltaV-Station:master' into salvsuitreplace
FluffiestFloof Oct 9, 2023
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
2 changes: 1 addition & 1 deletion 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 @@ -189,7 +189,7 @@
- id: ClothingBackpack
- id: ClothingShoesBootsSalvage
amount: 2
- id: ClothingUniformJumpsuitSalvageExplorer # DeltaV - Salvage better looking uniform, see Resources/Prototypes/DeltaV/Entities/Clothing/Uniform/jumpsuits.yml
- id: ClothingUniformJumpsuitSalvageSpecialist
amount: 2

- type: entity
Expand Down
11 changes: 0 additions & 11 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,3 @@
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSalvageExplorer
name: salvage specialist's jumpsuit
description: A grey uniform for operating in hazardous environments. It's very dirty.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi
6 changes: 0 additions & 6 deletions Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
description: It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi # DeltaV - Salvage better looking uniform
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi # DeltaV - Salvage better looking uniform

- type: entity
parent: ClothingUniformBase
Expand Down
3 changes: 1 addition & 2 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,6 @@
- ClothingUniformJumpsuitCargo
- ClothingUniformJumpskirtCargo
- ClothingUniformJumpsuitSalvageSpecialist
- ClothingUniformJumpsuitSalvageExplorer # DeltaV - Salvage better looking uniform, see Resources/Prototypes/DeltaV/Entities/Clothing/Uniform/jumpsuits.yml
- ClothingUniformJumpsuitChiefEngineer
- ClothingUniformJumpskirtChiefEngineer
- ClothingUniformJumpsuitChiefEngineerTurtle
Expand Down Expand Up @@ -870,7 +869,7 @@
runningState: building
canEjectStoredMaterials: false
staticRecipes:
- BluespaceCrystal #Nyano - Summary: Bluespace Crystals can be created here.
- BluespaceCrystal #Nyano - Summary: Bluespace Crystals can be created here.
- SheetSteel30
- SheetGlass30
- SheetRGlass30
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
- type: startingGear
id: SalvageSpecialistGear
equipment:
jumpsuit: ClothingUniformJumpsuitSalvageExplorer # DeltaV - Salvage better looking uniform, see Resources/Prototypes/DeltaV/Entities/Clothing/Uniform/jumpsuits.yml
jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
back: ClothingBackpackSalvageFilled
shoes: ClothingShoesBootsSalvage
id: SalvagePDA
Expand Down