diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index dbb9250dbb..38cc797432 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -95,7 +95,7 @@ - type: entity noSpawn: true - parent: ClothingBackpack + parent: ClothingBackpackCargo id: ClothingBackpackQuartermasterFilled components: - type: StorageFill @@ -300,6 +300,15 @@ - id: CrowbarRed - id: AdvMopItem +- type: entity + noSpawn: true + parent: ClothingBackpackCargo + id: ClothingBackpackCargoFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - type: entity noSpawn: true parent: ClothingBackpackSalvage diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 071e367ce6..cf2f11a038 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -104,7 +104,7 @@ - type: entity noSpawn: true - parent: ClothingBackpackDuffel + parent: ClothingBackpackDuffelCargo id: ClothingBackpackDuffelQuartermasterFilled components: - type: StorageFill @@ -225,6 +225,15 @@ - id: BoxForensicPad - id: HandLabeler +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelCargo + id: ClothingBackpackDuffelCargoFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - type: entity noSpawn: true parent: ClothingBackpackDuffelSalvage diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 205e162790..9e31043cee 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -104,7 +104,7 @@ - type: entity noSpawn: true - parent: ClothingBackpackSatchel + parent: ClothingBackpackSatchelCargo id: ClothingBackpackSatchelQuartermasterFilled components: - type: StorageFill @@ -214,6 +214,15 @@ - id: BoxForensicPad - id: HandLabeler +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelCargo + id: ClothingBackpackSatchelCargoFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - type: entity noSpawn: true parent: ClothingBackpackSatchelSalvage diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml index 70bee8f80e..927eaae5e4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml @@ -1,6 +1,9 @@ - type: vendingMachineInventory id: CargoDrobeInventory startingInventory: + ClothingBackpackCargo: 3 + ClothingBackpackSatchelCargo: 3 + ClothingBackpackDuffelCargo: 3 ClothingUniformJumpsuitCargo: 3 ClothingUniformJumpskirtCargo: 3 ClothingShoesColorBlack: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index c37423535c..7277ebb10a 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -159,6 +159,15 @@ - type: Sprite sprite: Clothing/Back/Backpacks/genetics.rsi +- type: entity + parent: ClothingBackpack + id: ClothingBackpackCargo + name: cargo backpack + description: A robust backpack for stealing cargo's loot. + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/cargo.rsi + - type: entity parent: ClothingBackpack id: ClothingBackpackSalvage diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index b2c406f92a..0892dd727e 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -154,6 +154,15 @@ - type: Sprite sprite: Clothing/Back/Duffels/hydroponics.rsi +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelCargo + name: cargo duffel bag + description: A large duffel bag for stealing cargo's precious loot. + components: + - type: Sprite + sprite: Clothing/Back/Duffels/cargo.rsi + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelSalvage diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index fcbaf03442..bb606bc3bc 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -156,6 +156,15 @@ - type: Sprite sprite: Clothing/Back/Satchels/hydroponics.rsi +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelCargo + name: cargo satchel + description: A robust satchel for stealing cargo's loot. + components: + - type: Sprite + sprite: Clothing/Back/Satchels/cargo.rsi + - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelSalvage diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 77dec00770..1ae36f0bdd 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -18,11 +18,11 @@ equipment: head: ClothingHeadHatCargosoft jumpsuit: ClothingUniformJumpsuitCargo - back: ClothingBackpackFilled + back: ClothingBackpackCargoFilled shoes: ClothingShoesColorBlack id: CargoPDA ears: ClothingHeadsetCargo pocket1: AppraisalTool innerclothingskirt: ClothingUniformJumpskirtCargo - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled + satchel: ClothingBackpackSatchelCargoFilled + duffelbag: ClothingBackpackDuffelCargoFilled diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..10030cdfc3 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/icon.png new file mode 100644 index 0000000000..2461338959 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png new file mode 100644 index 0000000000..aa67ac1a01 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png new file mode 100644 index 0000000000..729d35a62b Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json new file mode 100644 index 0000000000..5ce2c3cf97 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14", + "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/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..1c888ace63 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png new file mode 100644 index 0000000000..a296739d8d Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png new file mode 100644 index 0000000000..54d3af0227 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png new file mode 100644 index 0000000000..7aec3db48e Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json new file mode 100644 index 0000000000..5ce2c3cf97 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14", + "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/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..7dfb99ea3e Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/icon.png new file mode 100644 index 0000000000..f85e084338 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-left.png new file mode 100644 index 0000000000..bb2b3e163f Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-right.png new file mode 100644 index 0000000000..fe3aaec78b Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/meta.json new file mode 100644 index 0000000000..5ce2c3cf97 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}