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

Salvage cloak #631

Merged
merged 8 commits into from
Jan 19, 2024
Merged

Salvage cloak #631

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee35265
CLAOK TO BRRR
lleftTheDragon Dec 15, 2023
64e9eee
Merge remote-tracking branch 'upstream/master' into Cloak
lleftTheDragon Jan 1, 2024
8ef1330
Correct cloak placement
lleftTheDragon Jan 1, 2024
0f0fe20
more corrections
lleftTheDragon Jan 1, 2024
2394ab5
removed unwanted code
lleftTheDragon Jan 3, 2024
065144f
Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
lleftTheDragon Jan 8, 2024
b26309a
Update Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
lleftTheDragon Jan 8, 2024
36aff59
Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
lleftTheDragon Jan 8, 2024
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: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
- id: ClothingBeltUtility
- id: OreBag
- id: ClothingBeltSalvageWebbing
- id: ClothingNeckSalvager
lleftTheDragon marked this conversation as resolved.
Show resolved Hide resolved
prob: 0.8

- type: entity
id: CrateSalvageAssortedGoodies
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
prob: 0.3
- id: Flare
prob: 0.3
- id: ClothingNeckSalvager
lleftTheDragon marked this conversation as resolved.
Show resolved Hide resolved
prob: 0.2

- type: entity
id: LockerSalvageSpecialistFilled
Expand All @@ -48,3 +50,5 @@
prob: 0.3
- id: Flare
prob: 0.3
- id: ClothingNeckSalvager
lleftTheDragon marked this conversation as resolved.
Show resolved Hide resolved
prob: 0.2
9 changes: 9 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
View file
Open in desktop
Colin-Tel marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,15 @@
- type: Sprite
sprite: Clothing/Neck/Cloaks/trans.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckSalvager
name: salvager's cloak
description: Worn by dangerous people who've deconstructed stations with ease.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/salvage.rsi
Colin-Tel marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakGoliathCloak
Expand Down
Binary file added Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK3.png
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the purpose of the 3 in the filename? If it needs to be there, then it needs to be present when you reference this file, hence the errors.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed it, it was a hold over my B

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "by Lleft The Dragon/Lakilazur/lleft",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
Loading