various material & ore inhands (#33342)

* begin

* bones + pyrotten + goliath hide inhands

* Update Resources/Prototypes/Entities/Objects/Materials/materials.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* pyrottOn

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

Resources/Prototypes/Entities/Objects/Materials/materials.yml

@@ -54,6 +54,8 @@
         reagents:
         - ReagentId: Cellulose
           Quantity: 6
+  - type: Item
+    heldPrefix: cardboard
 
 - type: entity
   parent: MaterialCardboard
@@ -135,6 +137,8 @@
   - type: Construction
     graph: WebObjects # not sure if I should either keep this here or just make another prototype. Will keep it here just in case.
     node: cloth
+  - type: Item
+    heldPrefix: cloth
 
 - type: entity
   parent: MaterialCloth
@@ -195,6 +199,8 @@
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    heldPrefix: durathread
 
 - type: entity
   parent: MaterialDurathread
@@ -334,8 +340,7 @@
     sprite: Objects/Materials/materials.rsi
     state: corgihide
   - type: Item
-    sprite: Clothing/Head/Misc/hides.rsi
-    heldPrefix: corgi
+    heldPrefix: corgihide
   - type: Clothing
     sprite: Clothing/Head/Misc/hides.rsi
     equippedPrefix: corgi2
@@ -427,6 +432,8 @@
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    heldPrefix: cotton
 
 - type: entity
   parent: MaterialCotton
@@ -479,6 +486,8 @@
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    heldPrefix: pyrotton
 
 - type: entity
   parent: MaterialPyrotton
@@ -538,6 +547,8 @@
       - ReagentId: Honk
         Quantity: 5
   - type: Appearance
+  - type: Item
+    heldPrefix: bananium
 
 - type: entity
   parent: MaterialBananium
@@ -588,6 +599,9 @@
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    sprite: Objects/Materials/silk.rsi
+    heldPrefix: silk
 
 - type: entity
   parent: MaterialWebSilk
@@ -710,6 +724,8 @@
         reagents:
         - ReagentId: Vitamin
           Quantity: 3
+  - type: Item
+    heldPrefix: bones
 
 - type: entity
   parent: MaterialBones
@@ -764,6 +780,8 @@
     - goliath_hide_3
   - type: Item
     size: Large
+    heldPrefix: goliathhide
+    sprite: Objects/Materials/hide.rsi
     shape:
     - 0,0,2,2
 

Resources/Prototypes/Entities/Objects/Materials/ore.yml

@@ -46,6 +46,8 @@
         reagents:
         - ReagentId: Gold
           Quantity: 10
+  - type: Item
+    heldPrefix: gold
 
 - type: entity
   parent: GoldOre
@@ -77,6 +79,8 @@
         reagents:
         - ReagentId: Carbon
           Quantity: 20
+  - type: Item
+    heldPrefix: diamond
 
 - type: entity
   parent: DiamondOre
@@ -108,6 +112,8 @@
         reagents:
         - ReagentId: Iron
           Quantity: 10
+  - type: Item
+    heldPrefix: iron
 
 - type: entity
   id: SteelOre1
@@ -144,6 +150,8 @@
         reagents:
         - ReagentId: Plasma
           Quantity: 10
+  - type: Item
+    heldPrefix: plasma
 
 - type: entity
   parent: PlasmaOre
@@ -175,6 +183,8 @@
         reagents:
         - ReagentId: Silver
           Quantity: 10
+  - type: Item
+    heldPrefix: silver
 
 - type: entity
   parent: SilverOre
@@ -206,6 +216,8 @@
         reagents:
         - ReagentId: Silicon
           Quantity: 10
+  - type: Item
+    heldPrefix: spacequartz
 
 - type: entity
   parent: SpaceQuartz
@@ -245,6 +257,8 @@
         - ReagentId: Radium
           Quantity: 2
         canReact: false
+  - type: Item
+    heldPrefix: uranium
 
 - type: entity
   parent: UraniumOre
@@ -285,6 +299,8 @@
           Quantity: 2
         - ReagentId: Honk
           Quantity: 5
+  - type: Item
+    heldPrefix: bananium
 
 - type: entity
   parent: BananiumOre
@@ -324,6 +340,8 @@
   - type: PhysicalComposition
     materialComposition:
       Coal: 100
+  - type: Item
+    heldPrefix: coal
 
 - type: entity
   parent: Coal
@@ -381,6 +399,8 @@
           Quantity: 10
         - ReagentId: Iodine
           Quantity: 5
+  - type: Item
+    heldPrefix: salt
 
 - type: entity
   parent: SaltOre

Resources/Prototypes/Entities/Objects/Materials/parts.yml

@@ -45,7 +45,7 @@
       map: ["base"]
   - type: Item
     size: Normal
-#    heldPrefix: rods
+    heldPrefix: rods
   - type: Construction
     graph: MetalRod
     node: MetalRod

Resources/Textures/Objects/Materials/hide.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/88d236d5c91e9a57e103957555c2e9a8c63b68fa/icons/obj/stacks/organic.dmi",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/88d236d5c91e9a57e103957555c2e9a8c63b68fa/icons/obj/stacks/organic.dmi. Inhands by mubururu_ (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,14 @@
     {
       "name": "goliath_hide"
     },
+    {
+      "name": "goliathhide-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "goliathhide-inhand-right",
+      "directions": 4
+    },
     {
       "name": "goliath_hide_2"
     },
@@ -17,4 +25,4 @@
       "name": "goliath_hide_3"
     }
   ]
-}
+}

Resources/Textures/Objects/Materials/materials.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base.",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -16,6 +16,14 @@
     {
       "name": "bananium"
     },
+    {
+      "name": "bananium-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "bananium-inhand-right",
+      "directions": 4
+    },
     {
       "name": "bananium_1"
     },
@@ -36,6 +44,14 @@
     {
       "name": "cardboard"
     },
+    {
+      "name": "cardboard-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "cardboard-inhand-right",
+      "directions": 4
+    },
     {
       "name": "cardboard_2"
     },
@@ -48,6 +64,14 @@
     {
       "name": "cloth"
     },
+    {
+      "name": "cloth-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "cloth-inhand-right",
+      "directions": 4
+    },
     {
       "name": "cloth_2"
     },
@@ -57,9 +81,25 @@
     {
       "name": "corgihide"
     },
+    {
+      "name": "corgihide-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "corgihide-inhand-right",
+      "directions": 4
+    },
     {
       "name": "cotton"
     },
+    {
+      "name": "cotton-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "cotton-inhand-right",
+      "directions": 4
+    },
     {
       "name": "cotton_2"
     },
@@ -69,6 +109,14 @@
     {
       "name": "pyrotton"
     },
+    {
+      "name": "pyrotton-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "pyrotton-inhand-right",
+      "directions": 4
+    },
     {
       "name": "pyrotton_2"
     },
@@ -95,6 +143,14 @@
     {
       "name": "durathread"
     },
+    {
+      "name": "durathread-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "durathread-inhand-right",
+      "directions": 4
+    },
     {
       "name": "durathread_2"
     },
@@ -160,6 +216,14 @@
     {
       "name": "bones"
     },
+    {
+      "name": "bones-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "bones-inhand-right",
+      "directions": 4
+    },
     {
       "name": "bones_2"
     },

Resources/Textures/Objects/Materials/ore.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd",
+  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd. Inhands by mubururu_ (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -10,32 +10,112 @@
     {
       "name": "bananium"
     },
+    {
+      "name": "bananium-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "bananium-inhand-right",
+      "directions": 4
+    },
     {
       "name": "gold"
     },
+    {
+      "name": "gold-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "gold-inhand-right",
+      "directions": 4
+    },
     {
       "name": "iron"
     },
+    {
+      "name": "iron-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "iron-inhand-right",
+      "directions": 4
+    },
     {
       "name": "uranium"
     },
+    {
+      "name": "uranium-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "uranium-inhand-right",
+      "directions": 4
+    },
     {
       "name": "plasma"
     },
+    {
+      "name": "plasma-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "plasma-inhand-right",
+      "directions": 4
+    },
     {
       "name": "spacequartz"
     },
+    {
+      "name": "spacequartz-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "spacequartz-inhand-right",
+      "directions": 4
+    },
     {
       "name": "silver"
     },
+    {
+      "name": "silver-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "silver-inhand-right",
+      "directions": 4
+    },
     {
       "name": "coal"
     },
+    {
+      "name": "coal-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "coal-inhand-right",
+      "directions": 4
+    },
     {
       "name": "salt"
     },
+    {
+      "name": "salt-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "salt-inhand-right",
+      "directions": 4
+    },
     {
       "name": "diamond"
+    },
+    {
+      "name": "diamond-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "diamond-inhand-right",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Materials/parts.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Inhands by mubururu_ (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,14 @@
     {
       "name": "rods"
     },
+    {
+      "name": "rods-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "rods-inhand-right",
+      "directions": 4
+    },
     {
       "name": "rods_2"
     },

Resources/Textures/Objects/Materials/silk.rsi/meta.json

@@ -1,12 +1,20 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by PixelTheKermit (github) for SS14",
+  "copyright": "Made by PixelTheKermit (github) for SS14. Inhands by mubururu_ (github).",
   "size": {"x": 32, "y": 32},
   "states":
   [
     {
-      "name": "icon"
+        "name": "icon"
+    },
+    {
+        "name": "silk-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "silk-inhand-right",
+        "directions": 4
     }
   ]
 }