diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 5196ff6557..acd250797c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -213,3 +213,13 @@ - id: BoxLightMixed - id: BoxLightMixed - id: Soap + +- type: entity + noSpawn: true + parent: ClothingBackpackSalvage + id: ClothingBackpackSalvageFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 43bd9a859a..5f72fce38a 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -65,6 +65,15 @@ contents: - id: BoxSurvival +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelHydroponics + id: ClothingBackpackDuffelHydroponicsFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - type: entity noSpawn: true parent: ClothingBackpackDuffelMime @@ -119,3 +128,11 @@ - id: BoxForensicPad - id: HandLabeler +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelSalvage + id: ClothingBackpackDuffelSalvageFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index d43340abd0..0296477938 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -117,6 +117,15 @@ - id: BoxForensicPad - id: HandLabeler +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelSalvage + id: ClothingBackpackSatchelSalvageFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - type: entity noSpawn: true parent: ClothingBackpackSatchel diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml index 126385915b..787ad545c3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml @@ -3,6 +3,7 @@ startingInventory: ClothingBackpackHydroponics: 2 ClothingBackpackSatchelHydroponics: 2 + ClothingBackpackDuffelHydroponics: 2 ClothingOuterApronBotanist: 2 ClothingUniformOveralls: 3 ClothingUniformJumpsuitHydroponics: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 5ba09ddb3b..5bc40afb45 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -117,6 +117,15 @@ - type: Sprite sprite: Clothing/Back/Backpacks/virology.rsi +- type: entity + parent: ClothingBackpack + id: ClothingBackpackSalvage + name: salvage bag + description: A robust backpack for stashing your loot. + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/salvage.rsi + #ERT - type: entity parent: ClothingBackpack diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 9bd79448df..99492dd7e9 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -106,6 +106,24 @@ - type: Sprite sprite: Clothing/Back/Duffels/science.rsi +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelHydroponics + name: hydroponic's duffel bag + description: A large duffel bag for holding extra gardening tools. + components: + - type: Sprite + sprite: Clothing/Back/Duffels/hydroponics.rsi + +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelSalvage + name: salvage duffel bag + description: A large duffel bag for holding extra exotic treasures. + components: + - type: Sprite + sprite: Clothing/Back/Duffels/salvage.rsi + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelSyndicate diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 9c3417cdf9..963b1139d4 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -87,6 +87,15 @@ - type: Sprite sprite: Clothing/Back/Satchels/hydroponics.rsi +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelSalvage + name: salvage satchel + description: A robust satchel for stashing your loot. + components: + - type: Sprite + sprite: Clothing/Back/Satchels/salvage.rsi + - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelHolding diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 00139f92b9..b60d2160f7 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -19,9 +19,9 @@ id: SalvageSpecialistGear equipment: jumpsuit: ClothingUniformJumpsuitSalvageSpecialist - back: ClothingBackpackFilled + back: ClothingBackpackSalvageFilled shoes: ClothingShoesBootsSalvage id: SalvagePDA ears: ClothingHeadsetCargo - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled + satchel: ClothingBackpackSatchelSalvageFilled + duffelbag: ClothingBackpackDuffelSalvageFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index cd38bfa138..86c67c0c82 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -25,4 +25,4 @@ belt: ClothingBeltPlantFilled innerclothingskirt: ClothingUniformJumpskirtHydroponics satchel: ClothingBackpackSatchelHydroponicsFilled - duffelbag: ClothingBackpackDuffelFilled + duffelbag: ClothingBackpackDuffelHydroponicsFilled diff --git a/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..348ce39f18 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/icon.png new file mode 100644 index 0000000000..6d30a702f6 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/inhand-left.png new file mode 100644 index 0000000000..40936dad1f Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/inhand-right.png new file mode 100644 index 0000000000..36b871a699 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/meta.json new file mode 100644 index 0000000000..c166df646b --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/salvage.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..207e7184a0 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png new file mode 100644 index 0000000000..521eaa71c4 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-left.png new file mode 100644 index 0000000000..e6998e82c8 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-right.png new file mode 100644 index 0000000000..8810652894 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/meta.json new file mode 100644 index 0000000000..c166df646b --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..9ebc023508 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/icon.png new file mode 100644 index 0000000000..f62e3b3c59 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-left.png new file mode 100644 index 0000000000..3f611d3691 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-right.png new file mode 100644 index 0000000000..54ca73feca Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/meta.json new file mode 100644 index 0000000000..c166df646b --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..bc15dd1907 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/icon.png new file mode 100644 index 0000000000..aea8825390 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/inhand-left.png new file mode 100644 index 0000000000..23fd93f343 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/inhand-right.png new file mode 100644 index 0000000000..2f21ff8001 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/meta.json new file mode 100644 index 0000000000..c166df646b --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/salvage.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}