diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 3d0e57240a..dbb9250dbb 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -124,6 +124,15 @@ contents: - id: BoxSurvivalEngineering +- type: entity + noSpawn: true + parent: ClothingBackpackAtmospherics + id: ClothingBackpackAtmosphericsFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalEngineering + - type: entity noSpawn: true parent: ClothingBackpackScience diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 7498656d4a..071e367ce6 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -133,6 +133,16 @@ contents: - id: BoxSurvivalEngineering +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelAtmospherics + id: ClothingBackpackDuffelAtmosphericsFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalEngineering + + - type: entity noSpawn: true parent: ClothingBackpackDuffelScience diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 255b3b8609..205e162790 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -133,6 +133,15 @@ contents: - id: BoxSurvivalEngineering +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelAtmospherics + id: ClothingBackpackSatchelAtmosphericsFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalEngineering + - type: entity noSpawn: true parent: ClothingBackpackSatchelScience diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml index 0e12453bb1..72864ba851 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml @@ -1,9 +1,9 @@ - type: vendingMachineInventory id: AtmosDrobeInventory startingInventory: - ClothingBackpackDuffelEngineering: 2 - ClothingBackpackSatchelEngineering: 2 - ClothingBackpackEngineering: 2 + ClothingBackpackDuffelAtmospherics: 2 + ClothingBackpackSatchelAtmospherics: 2 + ClothingBackpackAtmospherics: 2 ClothingUniformJumpsuitAtmos: 3 ClothingUniformJumpskirtAtmos: 3 ClothingUniformJumpsuitAtmosCasual: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 87ac566447..c37423535c 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -78,6 +78,15 @@ - type: Sprite sprite: Clothing/Back/Backpacks/engineering.rsi +- type: entity + parent: ClothingBackpack + id: ClothingBackpackAtmospherics + name: atmospherics backpack + description: It's a backpack made of fire resistant fibers. Smells like plasma. + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/atmospherics.rsi + - type: entity parent: ClothingBackpack id: ClothingBackpackMedical diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 544823f6d0..b2c406f92a 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -39,6 +39,15 @@ - type: Sprite sprite: Clothing/Back/Duffels/engineering.rsi +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelAtmospherics + name: atmospherics duffel bag + description: A large duffel bag made of fire resistant fibers. Smells like plasma. + components: + - type: Sprite + sprite: Clothing/Back/Duffels/atmospherics.rsi + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelMedical diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 3fdd8f890c..fcbaf03442 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -45,6 +45,15 @@ - type: Sprite sprite: Clothing/Back/Satchels/engineering.rsi +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelAtmospherics + name: atmospherics satchel + description: A tough satchel made of fire resistant fibers. Smells like plasma. + components: + - type: Sprite + sprite: Clothing/Back/Satchels/atmospherics.rsi + - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelClown diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index bd4f4b9eba..9e7bd7ec74 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -20,12 +20,12 @@ id: AtmosphericTechnicianGear equipment: jumpsuit: ClothingUniformJumpsuitAtmos - back: ClothingBackpackEngineeringFilled + back: ClothingBackpackAtmosphericsFilled shoes: ClothingShoesColorWhite eyes: ClothingEyesGlassesMeson id: AtmosPDA belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering innerclothingskirt: ClothingUniformJumpskirtAtmos - satchel: ClothingBackpackSatchelEngineeringFilled - duffelbag: ClothingBackpackDuffelEngineeringFilled + satchel: ClothingBackpackSatchelAtmosphericsFilled + duffelbag: ClothingBackpackDuffelAtmosphericsFilled diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..503d6be951 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/icon.png new file mode 100644 index 0000000000..400cc41545 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-left.png new file mode 100644 index 0000000000..0be36bc309 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-right.png new file mode 100644 index 0000000000..3fb9fad6d7 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/meta.json new file mode 100644 index 0000000000..ed91c56e31 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.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 KingFroozy (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/atmospherics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..a15cccaf32 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png new file mode 100644 index 0000000000..35e6f81552 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-left.png new file mode 100644 index 0000000000..c164dba6fd Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-right.png new file mode 100644 index 0000000000..af9d3e6b03 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json new file mode 100644 index 0000000000..ed91c56e31 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/atmospherics.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 KingFroozy (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/atmospherics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..ecdbbe04e5 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/icon.png new file mode 100644 index 0000000000..c6b6edcf86 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-left.png new file mode 100644 index 0000000000..77bdd89c57 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-right.png new file mode 100644 index 0000000000..4811e50a91 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/meta.json new file mode 100644 index 0000000000..ed91c56e31 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/atmospherics.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 KingFroozy (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 + } + ] +}