diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 23b85e213c..1350e17e3a 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -36,7 +36,7 @@ components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalSecurity - id: Flash - type: entity @@ -46,7 +46,7 @@ components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalMedical - type: entity noSpawn: true @@ -66,7 +66,7 @@ components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalEngineering - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index e04a041d29..3a7699a047 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -24,7 +24,7 @@ components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalSecurity - id: Flash - type: entity @@ -34,7 +34,7 @@ components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalMedical - type: entity noSpawn: true @@ -54,7 +54,7 @@ components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalEngineering - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index dec35845df..80e178f06a 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -23,7 +23,7 @@ components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalSecurity - id: Flash - type: entity @@ -33,7 +33,7 @@ components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalMedical - type: entity noSpawn: true @@ -53,7 +53,7 @@ components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalEngineering - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml new file mode 100644 index 0000000000..dcdecfc68b --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -0,0 +1,93 @@ +- type: entity + name: survival box + parent: BoxCardboard + id: BoxSurvival + description: It's a box with basic internals inside. + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackChocolate + - type: Sprite + layers: + - state: internals + - state: emergencytank + +- type: entity + name: extended-capacity survival box + parent: BoxCardboard + id: BoxSurvivalEngineering + description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: ExtendedEmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackChocolate + - type: Sprite + layers: + - state: internals + - state: extendedtank + +- type: entity + name: survival box + parent: BoxCardboard + id: BoxSurvivalSecurity + description: It's a box with basic internals inside. + suffix: Security + components: + - type: StorageFill + contents: + - id: ClothingMaskGasSecurity + - id: EmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackChocolate + - type: Sprite + layers: + - state: internals + - state: emergencytank + +- type: entity + name: survival box + parent: BoxCardboard + id: BoxSurvivalMedical + description: It's a box with basic internals inside. + suffix: Medical + components: + - type: StorageFill + contents: + - id: ClothingMaskBreathMedical + - id: EmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackChocolate + - type: Sprite + layers: + - state: internals + - state: emergencytank + +- type: entity + name: box of hugs + parent: BoxCardboard + id: BoxHug + description: A special box for sensitive people. + components: + - type: Sprite + layers: + - state: box_hug + - state: heart + - type: Item + HeldPrefix: hug + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackChocolate diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 39cb18101d..778d7c8c73 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -135,41 +135,6 @@ - state: box - state: meson -- type: entity - name: survival box - parent: BoxCardboard - id: BoxSurvival - description: It's a box with basic internals inside. - components: - - type: StorageFill - contents: - - id: ClothingMaskBreath - - id: EmergencyOxygenTankFilled - - id: EmergencyMedipen - - id: Flare - - id: FoodSnackChocolate - - type: Sprite - layers: - - state: box - - state: writing - -- type: entity - name: box of hugs - parent: BoxCardboard - id: BoxHug - description: A special box for sensitive people. - components: - - type: Sprite - layers: - - state: box_hug - - state: heart - - type: Item - HeldPrefix: hug - - type: StorageFill - contents: - - id: Brutepack - amount: 6 - - type: entity name: inflatable wall box parent: BoxCardboard diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 3681174a9e..ac6fed8901 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -10,7 +10,7 @@ - id: YellowOxygenTank - id: ClothingShoesBootsMag - id: ClothingHeadHelmetHardsuitSalvage - - id: ClothingMaskGas + - id: ClothingMaskGasExplorer # Currently do not function as 'true' mesons, so they're useless for salvagers. # - id: ClothingEyesGlassesMeson - id: ClothingBeltUtilityFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index 0e141b3894..03d69815a7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -80,7 +80,7 @@ contents: - id: ClothingHeadHelmetHardsuitAtmos - id: ClothingOuterHardsuitAtmos - - id: ClothingMaskBreath + - id: ClothingMaskGasAtmos - id: OxygenTankFilled - id: ClothingOuterSuitAtmosFire - id: ClothingHeadHelmetAtmosFire @@ -96,7 +96,7 @@ - id: ClothingHeadHelmetHardsuitEngineering - id: ClothingOuterHardsuitEngineering - id: ClothingHandsGlovesColorYellow - - id: ClothingMaskBreath + - id: ClothingMaskGas - id: OxygenTankFilled - id: ClothingShoesBootsMag diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 4285fc42b8..a84a25112d 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -38,6 +38,7 @@ - id: ClothingNeckCloakCap - id: ClothingHandsGlovesCaptain - id: ClothingOuterHardsuitCap + - id: ClothingMaskGasCaptain - id: TaserGun - id: ClothingHeadHelmetHardsuitCap - id: CommsComputerCircuitboard @@ -172,6 +173,7 @@ prob: 0.1 - id: ClothingHeadHelmetHardsuitSecurityRed - id: ClothingOuterHardsuitSecurityRed + - id: ClothingMaskGasSecurity - id: ClothingShoeSlippersDuck prob: 0.2 - id: DrinkVacuumFlask diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index c0f0f83e93..82efdc12b0 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -1,8 +1,8 @@ - type: entity parent: ClothingMaskBase id: ClothingMaskGas - name: old gas mask - description: An old, dusty mask. Yet still dutifully functional. + name: gas mask + description: A face-covering mask that can be connected to an air supply. components: - type: Sprite sprite: Clothing/Mask/gas.rsi @@ -13,6 +13,122 @@ - type: DiseaseProtection protection: 0.05 +- type: entity + parent: ClothingMaskBase + id: ClothingMaskGasSecurity + name: security gas mask + description: A standard issue Security gas mask. + components: + - type: Sprite + sprite: Clothing/Mask/gassecurity.rsi + - type: Clothing + sprite: Clothing/Mask/gassecurity.rsi + - type: BreathMask + - type: IngestionBlocker + - type: DiseaseProtection + protection: 0.05 + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskGasSyndicate + name: syndicate gas mask + description: A close-fitting tactical mask that can be connected to an air supply. + components: + - type: Sprite + sprite: Clothing/Mask/gassyndicate.rsi + - type: Clothing + sprite: Clothing/Mask/gassyndicate.rsi + - type: BreathMask + - type: IngestionBlocker + - type: DiseaseProtection + protection: 0.05 + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskGasAtmos + name: atmospheric gas mask + description: Improved gas mask utilized by atmospheric technicians. It's flameproof! + components: + - type: Sprite + sprite: Clothing/Mask/gasatmos.rsi + - type: Clothing + sprite: Clothing/Mask/gasatmos.rsi + - type: BreathMask + - type: IngestionBlocker + - type: DiseaseProtection + protection: 0.05 + - type: Armor + modifiers: + coefficients: + Heat: 0.80 + +- type: entity + parent: ClothingMaskGasAtmos + id: ClothingMaskGasCaptain + name: captain's gas mask + description: Nanotrasen cut corners and repainted a spare atmospheric gas mask, but don't tell anyone. + components: + - type: Sprite + sprite: Clothing/Mask/gascaptain.rsi + - type: Clothing + sprite: Clothing/Mask/gascaptain.rsi + - type: BreathMask + - type: IngestionBlocker + - type: DiseaseProtection + protection: 0.05 + +- type: entity + parent: ClothingMaskGasAtmos + id: ClothingMaskGasCentcom + name: centcom gas mask + description: Oooh, gold and green. Fancy! This should help as you sit in your office. + components: + - type: Sprite + sprite: Clothing/Mask/gascentcom.rsi + - type: Clothing + sprite: Clothing/Mask/gascentcom.rsi + - type: BreathMask + - type: IngestionBlocker + - type: DiseaseProtection + protection: 0.05 + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskGasExplorer + name: explorer gas mask + description: A military-grade gas mask that can be connected to an air supply. + components: + - type: Sprite + sprite: Clothing/Mask/gasexplorer.rsi + - type: Clothing + sprite: Clothing/Mask/gasexplorer.rsi + - type: BreathMask + - type: IngestionBlocker + - type: DiseaseProtection + protection: 0.05 + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.95 + Heat: 0.95 + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskBreathMedical + name: medical mask + description: A close-fitting sterile mask that can be connected to an air supply. + components: + - type: Sprite + sprite: Clothing/Mask/medical.rsi + - type: Clothing + sprite: Clothing/Mask/medical.rsi + - type: BreathMask + - type: IngestionBlocker + - type: DiseaseProtection + protection: 0.10 + - type: entity parent: ClothingMaskBase id: ClothingMaskBreath diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 452d26e51f..0b1c3ffe9d 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -31,7 +31,7 @@ parent: GasTankBase id: OxygenTank name: oxygen tank - description: A tank of oxygen. + description: A tank of oxygen, this one is blue. components: - type: Sprite sprite: Objects/Tanks/oxygen.rsi @@ -77,7 +77,7 @@ - type: entity parent: OxygenTank id: EmergencyOxygenTank - name: extended-capacity emergency oxygen tank + name: emergency oxygen tank description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it. components: - type: Sprite @@ -85,7 +85,7 @@ - type: GasTank outputPressure: 21.27825 air: - volume: 2 + volume: 3 temperature: 293.15 - type: Clothing size: 10 @@ -98,7 +98,7 @@ - type: entity parent: EmergencyOxygenTank id: ExtendedEmergencyOxygenTank - name: double emergency oxygen tank + name: extended-capacity emergency oxygen tank description: Used for emergencies. Contains little oxygen, so try to conserve it until you actually need it. components: - type: Sprite @@ -120,13 +120,14 @@ - type: entity parent: ExtendedEmergencyOxygenTank id: DoubleEmergencyOxygenTank + name: double emergency oxygen tank components: - type: Sprite sprite: Objects/Tanks/emergency_double.rsi - type: GasTank outputPressure: 21.27825 air: - volume: 10 + volume: 12 temperature: 293.15 - type: Clothing size: 10 diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK.png new file mode 100644 index 0000000000..ef7d82b493 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK.png new file mode 100644 index 0000000000..4573a5a332 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/icon.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/icon.png new file mode 100644 index 0000000000..c5c6d94087 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-left.png new file mode 100644 index 0000000000..82e159590c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-right.png new file mode 100644 index 0000000000..a30b243b5d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json new file mode 100644 index 0000000000..2e57ae2151 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/gasatmos.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png new file mode 100644 index 0000000000..d19f0936e8 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png new file mode 100644 index 0000000000..ee566db54f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-left.png new file mode 100644 index 0000000000..fe2901acd1 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-right.png new file mode 100644 index 0000000000..5615899ced Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json new file mode 100644 index 0000000000..2e57ae2151 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/gascaptain.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK.png new file mode 100644 index 0000000000..28a2e1054f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/icon.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/icon.png new file mode 100644 index 0000000000..8316253b7d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascentcom.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-left.png new file mode 100644 index 0000000000..5f5f869dd5 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-right.png new file mode 100644 index 0000000000..3245c77892 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json new file mode 100644 index 0000000000..2e57ae2151 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/gascentcom.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK.png new file mode 100644 index 0000000000..af617b6194 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/icon.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/icon.png new file mode 100644 index 0000000000..30f77b39c5 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-left.png new file mode 100644 index 0000000000..fa8af014a2 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-right.png new file mode 100644 index 0000000000..fa8af014a2 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json new file mode 100644 index 0000000000..ff664dffd4 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "up-equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/up-equipped-MASK.png new file mode 100644 index 0000000000..31ecc7ebe9 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/up-equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK.png new file mode 100644 index 0000000000..41bd99dd6c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/icon.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/icon.png new file mode 100644 index 0000000000..68d604969f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-left.png new file mode 100644 index 0000000000..e3cc8a8566 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-right.png new file mode 100644 index 0000000000..dd0740367b Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json new file mode 100644 index 0000000000..ff664dffd4 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "up-equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK.png new file mode 100644 index 0000000000..fb11a38527 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK.png new file mode 100644 index 0000000000..f0a450045e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/icon.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/icon.png new file mode 100644 index 0000000000..e11d4e7717 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-left.png new file mode 100644 index 0000000000..b1fbec0354 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-right.png new file mode 100644 index 0000000000..8d024df084 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json new file mode 100644 index 0000000000..c5a4ced120 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4, + "delays": [ + [ 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5 ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK.png new file mode 100644 index 0000000000..8b7e021114 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/icon.png b/Resources/Textures/Clothing/Mask/medical.rsi/icon.png new file mode 100644 index 0000000000..c44b97068a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/medical.rsi/inhand-left.png new file mode 100644 index 0000000000..33b171c87a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/medical.rsi/inhand-right.png new file mode 100644 index 0000000000..7f71ac4831 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json new file mode 100644 index 0000000000..ff664dffd4 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "up-equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK.png new file mode 100644 index 0000000000..c59f016ce6 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png b/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png new file mode 100644 index 0000000000..0e6108b913 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png b/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png new file mode 100644 index 0000000000..3ddae9b2ca Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/internals.png b/Resources/Textures/Objects/Storage/boxes.rsi/internals.png new file mode 100644 index 0000000000..f6974a90c7 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/internals.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 2e5828ca83..ed17556473 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -6,139 +6,148 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "beaker" - }, - { - "name": "bodybags" - }, - { - "name": "clown" - }, - { - "name": "heart" - }, - { - "name": "meson" - }, - { - "name": "sechud" - }, - { - "name": "box" - }, - { - "name": "boxwide" - }, - { - "name": "box_hug" - }, - { - "name": "box_id" - }, - { - "name": "box_of_doom" - }, - { - "name": "box_of_doom_big" - }, - { - "name": "box_security" - }, - { - "name": "circuit" - }, - { - "name": "disk" - }, - { - "name": "flashbang" - }, - { - "name": "glasses" - }, - { - "name": "handcuff" - }, - { - "name": "implant" - }, - { - "name": "latex" - }, - { - "name": "light" - }, - { - "name": "lightmixed" - }, - { - "name": "lighttube" - }, - { - "name": "mousetraps" - }, - { - "name": "pda" - }, - { - "name": "pillbox" - }, - { - "name": "solution_trays" - }, - { - "name": "sterile" - }, - { - "name": "syringe" - }, - { - "name": "writing" - }, - { - "name": "writing_of_doom" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "hug-inhand-left", - "directions": 4 - }, - { - "name": "hug-inhand-right", - "directions": 4 - }, - { - "name": "shellbeanbag" - }, - { - "name": "shellflare" - }, - { - "name": "shellflash" - }, - { - "name": "shellincendiary" - }, - { - "name": "shelllethal" - }, - { - "name": "shellpractice" - }, - { - "name": "shellslug" - }, - { - "name": "ziptie" - } - ] + "states": [ + { + "name": "beaker" + }, + { + "name": "bodybags" + }, + { + "name": "clown" + }, + { + "name": "internals" + }, + { + "name": "extendedtank" + }, + { + "name": "emergencytank" + }, + { + "name": "heart" + }, + { + "name": "meson" + }, + { + "name": "sechud" + }, + { + "name": "box" + }, + { + "name": "boxwide" + }, + { + "name": "box_hug" + }, + { + "name": "box_id" + }, + { + "name": "box_of_doom" + }, + { + "name": "box_of_doom_big" + }, + { + "name": "box_security" + }, + { + "name": "circuit" + }, + { + "name": "disk" + }, + { + "name": "flashbang" + }, + { + "name": "glasses" + }, + { + "name": "handcuff" + }, + { + "name": "implant" + }, + { + "name": "latex" + }, + { + "name": "light" + }, + { + "name": "lightmixed" + }, + { + "name": "lighttube" + }, + { + "name": "mousetraps" + }, + { + "name": "pda" + }, + { + "name": "pillbox" + }, + { + "name": "solution_trays" + }, + { + "name": "sterile" + }, + { + "name": "syringe" + }, + { + "name": "writing" + }, + { + "name": "writing_of_doom" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "hug-inhand-left", + "directions": 4 + }, + { + "name": "hug-inhand-right", + "directions": 4 + }, + { + "name": "shellbeanbag" + }, + { + "name": "shellflare" + }, + { + "name": "shellflash" + }, + { + "name": "shellincendiary" + }, + { + "name": "shelllethal" + }, + { + "name": "shellpractice" + }, + { + "name": "shellslug" + }, + { + "name": "ziptie" + } + ] }