]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
vend tweaks and clothes (#14961)
authorpotato1234_x <79580518+potato1234x@users.noreply.github.com>
Fri, 31 Mar 2023 04:31:51 +0000 (14:31 +1000)
committerGitHub <noreply@github.com>
Fri, 31 Mar 2023 04:31:51 +0000 (22:31 -0600)
66 files changed:
Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml
Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Resources/Prototypes/Entities/Clothing/Back/duffel.yml
Resources/Prototypes/Entities/Clothing/Back/satchel.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/equipped-BACKPACK.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Backpacks/genetics.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/equipped-BACKPACK.png
Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png
Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-left.png
Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-right.png
Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png
Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png
Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png
Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png
Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json
Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Satchels/genetics.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon-open.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/broken.png
Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/off.png
Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/broken.png
Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/off.png

index 598eb1d693adc6ea21752cb3914c924a9cf1ac88..3b4872581e7e1372c7f59495e64122cd29a35d7c 100644 (file)
        - 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
        - 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
index 04e54ab70220b67dca5fb456f82e20e93e662f18..84a5f9a79b2c0fa41d2f96160af41bc7b459898d 100644 (file)
@@ -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
index e9b4b88b1c0e5cf7bba4c46a33ede325a072760b..b9144167a1c64d635bbcf672eb6d114d98fe0975 100644 (file)
@@ -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
index c1ddde80aaf999b7b219df8c167f99d9951cdda3..afa4d46cf8b716f0f5476a2885604e1fc43dac64 100644 (file)
   - 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
index 73d8c907df1562c9d3d98fbcff24d92c5ddb63c9..c7a9a23d5e7356c64091c9297a2150259b9e0995 100644 (file)
   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
index 2d0c152580f57c97b858ec1c5e7680c7b9be539d..50709777a68b34899c80ae204540895368980db2 100644 (file)
   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
index 0181c83a44ef8da5a4dac9d65e80e1abdae91235..0429396d646eb8efe5e48f0dd2192754ea5ddfdf 100644 (file)
   - 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
 - 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
   - 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
index 511cd8cff4c49e1d351772c70cc92af368facd90..6ab0f549896b05af829422aec735c6c73eb281aa 100644 (file)
   - 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
index 8af7e3d77c0553df85dd010ea3571d424e5be64c..e87e516f29253b4d77efcecaea9c9da18054ff81 100644 (file)
   - 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 (file)
index 0000000..28c9875
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 (file)
index 0000000..b14fab5
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 (file)
index 0000000..098742e
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 (file)
index 0000000..61769e4
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 (file)
index 0000000..cfb4c7b
--- /dev/null
@@ -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
+    }
+  ]
+}
index e88663b3a60b045e98d354e9a448f4e01376e4a3..2a9c62f4e9a1899fc776dbabbfc8b70af53a4e45 100644 (file)
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
index 26dd1e4c0a882373bc58a93bfd7376e48fbc784d..ec4cf4ab8e6ce1dd7b934d68e45fd60f2f4e58f0 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png differ
index 8a35e6c49ad8c645da7c31d25e7248c3b1769e43..947881f08d20eb0adfad47f392447d417095566c 100644 (file)
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
index b998e351b1624042222ad34bbb37a3bdd38656e5..45fe1f42b277c585c9643d29a18d881880c47087 100644 (file)
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 (file)
index 0000000..bb274be
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 (file)
index 0000000..b48c8f5
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 (file)
index 0000000..e0dab47
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 (file)
index 0000000..39db3d7
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 (file)
index 0000000..ac5b546
--- /dev/null
@@ -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
index b8cf3a4a6099565273d381ae4fa118fbe1dcac71..c86cf500e9455b5db5d8e1919ff82facf1d1e430 100644 (file)
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
index c4da60f5d1cc253a1db964b1da1c988d01a9b3ae..c3a5469919b211f2b7aef5ff024449d001ea17db 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png differ
index 35b71feb872d5f265a0e92da4fa2bb11d1aa6273..5a0a228b0d5164c644c18c74492ca0b9c5ded658 100644 (file)
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
index 6c4c799b6b1119b132634e104eff132fd471a692..72fbcbfebe86138a190ee4710570b0a3fa4f93d0 100644 (file)
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
index de1ffb261fcedbb298e1b04455f15bce98a5564a..ac5b5463410e1998732d5d8a5520a94cad781ed4 100644 (file)
@@ -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 (file)
index 0000000..20f7eb8
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 (file)
index 0000000..02abe49
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 (file)
index 0000000..68eaa7c
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 (file)
index 0000000..7179575
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 (file)
index 0000000..5377347
--- /dev/null
@@ -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 (file)
index 0000000..06923c3
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 (file)
index 0000000..b2d5f44
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 (file)
index 0000000..998a03c
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 (file)
index 0000000..5785736
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 (file)
index 0000000..b2c0d27
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 (file)
index 0000000..442bfb2
--- /dev/null
@@ -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 (file)
index 0000000..e448295
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 (file)
index 0000000..708dea3
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 (file)
index 0000000..04f6c36
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 (file)
index 0000000..b464902
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 (file)
index 0000000..0ee22bf
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 (file)
index 0000000..cfb2a8f
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 (file)
index 0000000..7071a1d
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 (file)
index 0000000..8575ac8
--- /dev/null
@@ -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 (file)
index 0000000..361a1d1
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 (file)
index 0000000..a93fd85
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 (file)
index 0000000..1bb069d
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 (file)
index 0000000..e8cfe71
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 (file)
index 0000000..8575ac8
--- /dev/null
@@ -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 (file)
index 0000000..04e4612
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 (file)
index 0000000..83fa7d6
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 (file)
index 0000000..cfb2a8f
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 (file)
index 0000000..7071a1d
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 (file)
index 0000000..8575ac8
--- /dev/null
@@ -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 (file)
index 0000000..3898432
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 (file)
index 0000000..8e647ef
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 (file)
index 0000000..1bb069d
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 (file)
index 0000000..e8cfe71
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 (file)
index 0000000..8575ac8
--- /dev/null
@@ -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
+    }
+  ]
+}
index 2a08406d1498126dbc4caaf6469721a60c92447e..70962b2a1fe901f1bb65f901fc1a0dab1af1642d 100644 (file)
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/broken.png differ
index c6649e8e2dc430afaa2499dd5fd38b52038fc625..9d7677fc7bc434dd0070efefd6bdb68c22f6807e 100644 (file)
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi/off.png differ
index 879f5dedb2cdd565570e6d43c757e027948c9053..2916ce08dc0e94ca3bc9e761f2f38d32a698e9e9 100644 (file)
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/broken.png differ
index 8559b722b0bd68d59d9d46125aa6fd5f29fc31f6..03f772901f224179411278595d61a0e869782947 100644 (file)
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi/off.png differ