From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Fri, 31 Mar 2023 04:31:51 +0000 (+1000) Subject: vend tweaks and clothes (#14961) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=dbf9f71ee8694cba15cf7151c7435b72becfacea;p=space-station-14.git vend tweaks and clothes (#14961) --- diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index 598eb1d693..3b4872581e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -45,15 +45,43 @@ - id: ClothingUniformJumpskirtChemistry amount: 1 -# - type: entity -# id: WardrobeGeneticsFilled -# suffix: Filled -# parent: WardrobeGenetics + - type: entity + id: WardrobeGeneticsFilled + suffix: Filled + parent: WardrobeGenetics + description: "The sleek blue threads contained within make you much less likely to be thrown out of the genetics lab." + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitGenetics + amount: 1 + - id: ClothingBackpackGenetics + amount: 1 + - id: ClothingShoesColorWhite + amount: 1 + - id: ClothingOuterCoatLabGene + amount: 1 + - id: ClothingUniformJumpskirtGenetics + amount: 1 -# - type: entity -# id: WardrobeVirologyFilled -# suffix: Filled -# parent: WardrobeVirology + - type: entity + id: WardrobeVirologyFilled + suffix: Filled + parent: WardrobeVirology + description: "The sleek green threads contained within make you much less likely to be thrown out of the virology lab." + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitVirology + amount: 1 + - id: ClothingBackpackVirology + amount: 1 + - id: ClothingShoesColorWhite + amount: 1 + - id: ClothingOuterCoatLabViro + amount: 1 + - id: ClothingUniformJumpskirtVirology + amount: 1 - type: entity id: WardrobeScienceFilled @@ -201,10 +229,22 @@ - id: ClothingUniformJumpsuitSalvageSpecialist amount: 2 -# - type: entity -# id: WardrobeAtmosphericsFilled -# suffix: Filled -# parent: WardrobeAtmospherics + - type: entity + id: WardrobeAtmosphericsFilled + suffix: Filled + parent: WardrobeAtmospherics + description: "This locker contains a uniform for atmospheric technicians." + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitAtmos + amount: 1 + - id: ClothingBackpackEngineering + amount: 1 + - id: ClothingShoesColorWhite + amount: 1 + - id: ClothingUniformJumpskirtAtmos + amount: 1 - type: entity id: WardrobeEngineeringFilled diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml index 04e54ab702..84a5f9a79b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml @@ -1,8 +1,11 @@ - type: vendingMachineInventory id: GeneDrobeInventory startingInventory: + ClothingUniformJumpsuitGenetics: 2 + ClothingUniformJumpskirtGenetics: 2 ClothingShoesColorWhite: 2 - ClothingOuterCoatLab: 2 - ClothingHandsGlovesLatex: 2 - ClothingHeadsetMedical: 2 + ClothingOuterCoatLabGene: 2 ClothingOuterWinterGen: 2 + ClothingBackpackGenetics: 2 + ClothingBackpackSatchelGenetics: 2 + ClothingBackpackDuffelGenetics: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml index e9b4b88b1c..b9144167a1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml @@ -1,10 +1,12 @@ - type: vendingMachineInventory id: ViroDrobeInventory startingInventory: + ClothingUniformJumpsuitVirology: 2 + ClothingUniformJumpskirtVirology: 2 ClothingShoesColorWhite: 2 ClothingOuterCoatLabViro: 2 + ClothingOuterWinterViro: 2 + ClothingMaskSterile: 2 ClothingBackpackVirology: 2 - ClothingBackpackDuffelVirology: 2 ClothingBackpackSatchelVirology: 2 - ClothingHeadsetMedical: 2 - ClothingOuterWinterViro: 2 + ClothingBackpackDuffelVirology: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index c1ddde80aa..afa4d46cf8 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -120,6 +120,15 @@ - type: Sprite sprite: Clothing/Back/Backpacks/virology.rsi +- type: entity + parent: ClothingBackpack + id: ClothingBackpackGenetics + name: genetics backpack + description: A backpack designed to be super tough, just in case someone hulks out on you. + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/genetics.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 73d8c907df..c7a9a23d5e 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -92,6 +92,15 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/virology.rsi + +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelGenetics + name: genetics duffel bag + description: A large duffel bag for holding extra genetic mutations. + components: + - type: Sprite + sprite: Clothing/Back/Duffels/genetics.rsi - type: entity parent: ClothingBackpackDuffel diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 2d0c152580..50709777a6 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -68,6 +68,15 @@ components: - type: Sprite sprite: Clothing/Back/Satchels/virology.rsi + +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelGenetics + name: genetics satchel + description: A sterile satchel with geneticist colours. + components: + - type: Sprite + sprite: Clothing/Back/Satchels/genetics.rsi - type: entity parent: ClothingBackpackSatchel diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 0181c83a44..0429396d64 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -94,12 +94,12 @@ - type: Armor modifiers: coefficients: - Caustic: 0.9 + Caustic: 0.75 - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatLabChem - name: lab coat (chem) + name: chemist lab coat description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder. components: - type: Sprite @@ -114,7 +114,7 @@ - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatLabViro - name: lab coat (viro) + name: virologist lab coat description: A suit that protects against bacteria and viruses. Has an green stripe on the shoulder. components: - type: Sprite @@ -124,7 +124,23 @@ - type: Armor modifiers: coefficients: - Caustic: 0.9 + Caustic: 0.75 + + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatLabGene + name: geneticist lab coat + description: A suit that protects against minor chemical spills. Has an blue stripe on the shoulder. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/labcoat_gene.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/labcoat_gene.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.75 - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 511cd8cff4..6ab0f54989 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -79,6 +79,28 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/chemistry.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtVirology + name: virology jumpskirt + description: It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/virology.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/virology.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtGenetics + name: genetics jumpskirt + description: It's made of a special fiber that gives special protection against biohazards. It has a geneticist rank stripe on it. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/genetics.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/genetics.rsi + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtCMO diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 8af7e3d77c..e87e516f29 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -139,6 +139,28 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitVirology + name: virology jumpsuit + description: It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/virology.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/virology.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitGenetics + name: genetics jumpsuit + description: It's made of a special fiber that gives special protection against biohazards. It has a geneticist rank stripe on it. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/genetics.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/genetics.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitClown diff --git a/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..28c98751eb Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/icon.png new file mode 100644 index 0000000000..b14fab5de0 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/inhand-left.png new file mode 100644 index 0000000000..098742e0e3 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/inhand-right.png new file mode 100644 index 0000000000..61769e457e Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/meta.json new file mode 100644 index 0000000000..cfb4c7b254 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/genetics.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/15c87fd15fe205e4fc71997e48311e06ff02a1d4", + "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/chemistry.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/equipped-BACKPACK.png index e88663b3a6..2a9c62f4e9 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png index 26dd1e4c0a..ec4cf4ab8e 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-left.png index 8a35e6c49a..947881f08d 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-right.png index b998e351b1..45fe1f42b2 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..bb274bec3e Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png new file mode 100644 index 0000000000..b48c8f590a Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png new file mode 100644 index 0000000000..e0dab47ddf Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png new file mode 100644 index 0000000000..39db3d7260 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json new file mode 100644 index 0000000000..ac5b546341 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png index b8cf3a4a60..c86cf500e9 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png index c4da60f5d1..c3a5469919 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png index 35b71feb87..5a0a228b0d 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png index 6c4c799b6b..72fbcbfebe 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json index de1ffb261f..ac5b546341 100644 --- a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..20f7eb80d8 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png new file mode 100644 index 0000000000..02abe49825 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png new file mode 100644 index 0000000000..68eaa7cf44 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png new file mode 100644 index 0000000000..717957515b Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/meta.json new file mode 100644 index 0000000000..5377347324 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/genetics.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/15c87fd15fe205e4fc71997e48311e06ff02a1d4", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..06923c3ec9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon-open.png new file mode 100644 index 0000000000..b2d5f44f7d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png new file mode 100644 index 0000000000..998a03c4a4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-left.png new file mode 100644 index 0000000000..5785736ec0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-right.png new file mode 100644 index 0000000000..b2c0d27a36 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json new file mode 100644 index 0000000000..442bfb2920 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "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": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..e448295da5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png new file mode 100644 index 0000000000..708dea3d7b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png new file mode 100644 index 0000000000..04f6c36d3f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..b464902a9e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png new file mode 100644 index 0000000000..0ee22bf147 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png new file mode 100644 index 0000000000..cfb2a8ff2b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png new file mode 100644 index 0000000000..7071a1d512 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/meta.json new file mode 100644 index 0000000000..8575ac87cc --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.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/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..361a1d1e04 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png new file mode 100644 index 0000000000..a93fd858b6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png new file mode 100644 index 0000000000..1bb069da77 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png new file mode 100644 index 0000000000..e8cfe71e97 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/meta.json new file mode 100644 index 0000000000..8575ac87cc --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.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/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..04e4612cfc Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png new file mode 100644 index 0000000000..83fa7d679b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png new file mode 100644 index 0000000000..cfb2a8ff2b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png new file mode 100644 index 0000000000..7071a1d512 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/meta.json new file mode 100644 index 0000000000..8575ac87cc --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.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/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..3898432b87 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png new file mode 100644 index 0000000000..8e647ef78f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png new file mode 100644 index 0000000000..1bb069da77 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png new file mode 100644 index 0000000000..e8cfe71e97 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/meta.json new file mode 100644 index 0000000000..8575ac87cc --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.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/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/broken.png index 2a08406d14..70962b2a1f 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/off.png index c6649e8e2d..9d7677fc7b 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/broken.png index 879f5dedb2..2916ce08dc 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/off.png index 8559b722b0..03f772901f 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/off.png differ