Adds inhands and removes vir and genetics satchels. (#2003)

* Satchels now have a nice RSI

* Adds inhands for all the satchels

* Annnd we're done!

Resources/Prototypes/Entities/Clothing/Back/satchel.yml

@@ -1,168 +1,121 @@
 - type: entity
-  parent: BackpackClothing
+  parent: Clothing
-  id: Satchel
+  id: SatchelBase
   name: satchel
   description: A trendy looking satchel.
   components:
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel.rsi
-    state: satchel
+    state: icon
   - type: Icon
     sprite: Clothing/Back/Satchels/satchel.rsi
-    state: satchel
+    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel.rsi
-    ClothingPrefix: satchel
   - type: Storage
-    capacity: 300
+    capacity: 100
 
 - type: entity
-  parent: BackpackClothing
+  parent: SatchelBase
   id: SatchelEngineering
   name: engineering satchel
   description: A tough satchel with extra pockets.
   components:
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_engineering.rsi
-    state: satchel-engineering
+    state: icon
   - type: Icon
     sprite: Clothing/Back/Satchels/satchel_engineering.rsi
-    state: satchel-engineering
+    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_engineering.rsi
-    HeldPrefix: engineering
-    ClothingPrefix: satchel-engineering
 
 - type: entity
-  parent: BackpackClothing
+  parent: SatchelBase
   id: SatchelMedical
   name: medical satchel
   description: A sterile satchel used in medical departments.
   components:
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_medical.rsi
-    state: satchel-medical
+    state: icon
   - type: Icon
     sprite: Clothing/Back/Satchels/satchel_medical.rsi
-    state: satchel-medical
+    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_medical.rsi
-    HeldPrefix: medical
-    ClothingPrefix: satchel-medical
 
 - type: entity
-  parent: BackpackClothing
+  parent: SatchelBase
   id: SatchelChemistry
   name: chemistry satchel
   description: A sterile satchel with chemist colours.
   components:
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
-    state: satchel-chemistry
+    state: icon
   - type: Icon
     sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
-    state: satchel-chemistry
+    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
-    HeldPrefix: medical
-    ClothingPrefix: satchel-chemistry
 
 - type: entity
-  parent: BackpackClothing
+  parent: SatchelBase
-  id: SatchelGenetics
-  name: genetics satchel
-  description: A sterile satchel with geneticist colours.
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_genetics.rsi
-    state: satchel-genetics
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_genetics.rsi
-    state: satchel-genetics
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_genetics.rsi
-    HeldPrefix: medical
-    ClothingPrefix: satchel-genetics
-
-- type: entity
-  parent: BackpackClothing
-  id: SatchelVirology
-  name: virology satchel
-  description: A sterile satchel with virologist colours.
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_virology.rsi
-    state: satchel-virology
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_virology.rsi
-    state: satchel-virology
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_virology.rsi
-    HeldPrefix: medical
-    ClothingPrefix: satchel-virology
-
-- type: entity
-  parent: BackpackClothing
   id: SatchelScience
   name: science satchel
   description: Useful for holding research materials.
   components:
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_science.rsi
-    state: satchel-science
+    state: icon
   - type: Icon
     sprite: Clothing/Back/Satchels/satchel_science.rsi
-    state: satchel-science
+    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_science.rsi
-    ClothingPrefix: satchel-science
 
 - type: entity
-  parent: BackpackClothing
+  parent: SatchelBase
   id: SatchelSecurity
   name: security satchel
   description: A robust satchel for security related needs.
   components:
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_security.rsi
-    state: satchel-security
+    state: icon
   - type: Icon
     sprite: Clothing/Back/Satchels/satchel_security.rsi
-    state: satchel-security
+    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_security.rsi
-    HeldPrefix: security
-    ClothingPrefix: satchel-security
 
 - type: entity
-  parent: BackpackClothing
+  parent: SatchelBase
   id: SatchelCaptain
   name: captain's satchel
   description: An exclusive satchel for Nanotrasen officers.
   components:
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_captain.rsi
-    state: satchel-captain
+    state: icon
   - type: Icon
     sprite: Clothing/Back/Satchels/satchel_captain.rsi
-    state: satchel-captain
+    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_captain.rsi
-    HeldPrefix: captain
-    ClothingPrefix: satchel-captain
 
 - type: entity
-  parent: BackpackClothing
+  parent: SatchelBase
   id: SatchelHydroponics
   name: hydroponics satchel
   description: A satchel made of all natural fibers.
   components:
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
-    state: satchel-hydroponics
+    state: icon
   - type: Icon
     sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
-    state: satchel-hydroponics
+    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
-    ClothingPrefix: satchel-hydroponics

Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json

@@ -1,17 +1,27 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-	{
-            "name": "satchel-equipped-BACKPACK",
-            "directions": 4
-	},
         {
-            "name": "satchel",
+            "name": "icon",
             "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/meta.json

@@ -1,17 +1,27 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "satchel-captain-equipped-BACKPACK",
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
             "directions": 4
         },
         {
-            "name": "satchel-captain",
+            "name": "inhand-left",
-            "directions": 1
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/meta.json

@@ -1,17 +1,27 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "satchel-chemistry-equipped-BACKPACK",
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
             "directions": 4
         },
         {
-            "name": "satchel-chemistry",
+            "name": "inhand-left",
-            "directions": 1
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/meta.json

@@ -1,17 +1,27 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "satchel-engineering-equipped-BACKPACK",
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
             "directions": 4
         },
         {
-            "name": "satchel-engineering",
+            "name": "inhand-left",
-            "directions": 1
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/meta.json

@@ -1,17 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "satchel-genetics-equipped-BACKPACK",
-            "directions": 4
-        },
-        {
-            "name": "satchel-genetics",
-            "directions": 1
-        }
-    ]
-}

Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json

@@ -1,17 +1,27 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "satchel-hydroponics-equipped-BACKPACK",
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
             "directions": 4
         },
         {
-            "name": "satchel-hydroponics",
+            "name": "inhand-left",
-            "directions": 1
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/meta.json

@@ -1,17 +1,27 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "satchel-medical-equipped-BACKPACK",
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
             "directions": 4
         },
         {
-            "name": "satchel-medical",
+            "name": "inhand-left",
-            "directions": 1
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json

@@ -1,16 +1,26 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "satchel-science",
+            "name": "icon",
             "directions": 1
         },
         {
-            "name": "satchel-science-equipped-BACKPACK",
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
             "directions": 4
         }
     ]

Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json

@@ -1,17 +1,27 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "satchel-security-equipped-BACKPACK",
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
             "directions": 4
         },
         {
-            "name": "satchel-security",
+            "name": "inhand-left",
-            "directions": 1
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/meta.json

@@ -1,17 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "satchel-virology",
-            "directions": 1
-        },
-        {
-            "name": "satchel-virology-equipped-BACKPACK",
-            "directions": 4
-        }
-    ]
-}