]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
various material & ore inhands (#33342)
authormubururu_ <139181059+muburu@users.noreply.github.com>
Sun, 24 Nov 2024 16:24:13 +0000 (10:24 -0600)
committerGitHub <noreply@github.com>
Sun, 24 Nov 2024 16:24:13 +0000 (17:24 +0100)
* 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>
50 files changed:
Resources/Prototypes/Entities/Objects/Materials/materials.yml
Resources/Prototypes/Entities/Objects/Materials/ore.yml
Resources/Prototypes/Entities/Objects/Materials/parts.yml
Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/hide.rsi/meta.json
Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/meta.json
Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/meta.json
Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/parts.rsi/meta.json
Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/silk.rsi/meta.json
Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-right.png [new file with mode: 0644]

index 8371e21c65982c83824ff01733c51a99c590ef77..e16044b282608213d538d836fe0bf6074eff3240 100644 (file)
@@ -54,6 +54,8 @@
         reagents:
         - ReagentId: Cellulose
           Quantity: 6
+  - type: Item
+    heldPrefix: cardboard
 
 - type: entity
   parent: MaterialCardboard
   - 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
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    heldPrefix: durathread
 
 - type: entity
   parent: MaterialDurathread
     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
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    heldPrefix: cotton
 
 - type: entity
   parent: MaterialCotton
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    heldPrefix: pyrotton
 
 - type: entity
   parent: MaterialPyrotton
       - ReagentId: Honk
         Quantity: 5
   - type: Appearance
+  - type: Item
+    heldPrefix: bananium
 
 - type: entity
   parent: MaterialBananium
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    sprite: Objects/Materials/silk.rsi
+    heldPrefix: silk
 
 - type: entity
   parent: MaterialWebSilk
         reagents:
         - ReagentId: Vitamin
           Quantity: 3
+  - type: Item
+    heldPrefix: bones
 
 - type: entity
   parent: MaterialBones
     - goliath_hide_3
   - type: Item
     size: Large
+    heldPrefix: goliathhide
+    sprite: Objects/Materials/hide.rsi
     shape:
     - 0,0,2,2
 
index fd46fb40be27d9fbd0ab59a52013ffc2adea33e4..9d07aed853be4dc07095e073894e9f84c17bcc9f 100644 (file)
@@ -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
         reagents:
         - ReagentId: Iron
           Quantity: 10
+  - type: Item
+    heldPrefix: iron
 
 - type: entity
   id: SteelOre1
         reagents:
         - ReagentId: Plasma
           Quantity: 10
+  - type: Item
+    heldPrefix: plasma
 
 - type: entity
   parent: PlasmaOre
         reagents:
         - ReagentId: Silver
           Quantity: 10
+  - type: Item
+    heldPrefix: silver
 
 - type: entity
   parent: SilverOre
         reagents:
         - ReagentId: Silicon
           Quantity: 10
+  - type: Item
+    heldPrefix: spacequartz
 
 - type: entity
   parent: SpaceQuartz
         - ReagentId: Radium
           Quantity: 2
         canReact: false
+  - type: Item
+    heldPrefix: uranium
 
 - type: entity
   parent: UraniumOre
           Quantity: 2
         - ReagentId: Honk
           Quantity: 5
+  - type: Item
+    heldPrefix: bananium
 
 - type: entity
   parent: BananiumOre
   - type: PhysicalComposition
     materialComposition:
       Coal: 100
+  - type: Item
+    heldPrefix: coal
 
 - type: entity
   parent: Coal
           Quantity: 10
         - ReagentId: Iodine
           Quantity: 5
+  - type: Item
+    heldPrefix: salt
 
 - type: entity
   parent: SaltOre
index 1db564c3b31bd94b0a38f3dd31b3f05a0857394e..700c08e096afd65f4e7471dbdc749ac8007e40a8 100644 (file)
@@ -45,7 +45,7 @@
       map: ["base"]
   - type: Item
     size: Normal
-#    heldPrefix: rods
+    heldPrefix: rods
   - type: Construction
     graph: MetalRod
     node: MetalRod
diff --git a/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-left.png b/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-left.png
new file mode 100644 (file)
index 0000000..b9a381e
Binary files /dev/null and b/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-right.png b/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-right.png
new file mode 100644 (file)
index 0000000..6d38223
Binary files /dev/null and b/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-right.png differ
index 0ec2b25480074a84c1946d347b4e3137ad7657e1..9235e8e2e932c6e59ec8a4ea8609798e5e5397fa 100644 (file)
@@ -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
     {
       "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"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-left.png
new file mode 100644 (file)
index 0000000..b936e0f
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-right.png
new file mode 100644 (file)
index 0000000..e352e25
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-left.png
new file mode 100644 (file)
index 0000000..07a339d
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-right.png
new file mode 100644 (file)
index 0000000..5eb6490
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-left.png
new file mode 100644 (file)
index 0000000..fd69f67
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-right.png
new file mode 100644 (file)
index 0000000..58e1ddc
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-left.png
new file mode 100644 (file)
index 0000000..22b176f
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-right.png
new file mode 100644 (file)
index 0000000..15c2d61
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-left.png
new file mode 100644 (file)
index 0000000..28d69dd
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-right.png
new file mode 100644 (file)
index 0000000..a75f4f9
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-left.png
new file mode 100644 (file)
index 0000000..ec91847
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-right.png
new file mode 100644 (file)
index 0000000..adb73f4
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-left.png
new file mode 100644 (file)
index 0000000..139c2a5
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-right.png
new file mode 100644 (file)
index 0000000..4572ed1
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-right.png differ
index 3ae12dc14c028f4321b354ff643868c47955f4e6..9fbad41e484ebbf0b8702be998cee2bc6962ade6 100644 (file)
@@ -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
     {
       "name": "bananium"
     },
+    {
+      "name": "bananium-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "bananium-inhand-right",
+      "directions": 4
+    },
     {
       "name": "bananium_1"
     },
     {
       "name": "cardboard"
     },
+    {
+      "name": "cardboard-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "cardboard-inhand-right",
+      "directions": 4
+    },
     {
       "name": "cardboard_2"
     },
     {
       "name": "cloth"
     },
+    {
+      "name": "cloth-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "cloth-inhand-right",
+      "directions": 4
+    },
     {
       "name": "cloth_2"
     },
     {
       "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"
     },
     {
       "name": "pyrotton"
     },
+    {
+      "name": "pyrotton-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "pyrotton-inhand-right",
+      "directions": 4
+    },
     {
       "name": "pyrotton_2"
     },
     {
       "name": "durathread"
     },
+    {
+      "name": "durathread-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "durathread-inhand-right",
+      "directions": 4
+    },
     {
       "name": "durathread_2"
     },
     {
       "name": "bones"
     },
+    {
+      "name": "bones-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "bones-inhand-right",
+      "directions": 4
+    },
     {
       "name": "bones_2"
     },
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-left.png
new file mode 100644 (file)
index 0000000..e47685d
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-right.png
new file mode 100644 (file)
index 0000000..3225dc0
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-left.png
new file mode 100644 (file)
index 0000000..01b00bc
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-right.png
new file mode 100644 (file)
index 0000000..8c7fddf
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-left.png
new file mode 100644 (file)
index 0000000..094a473
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-right.png
new file mode 100644 (file)
index 0000000..a8286cd
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-left.png
new file mode 100644 (file)
index 0000000..837741a
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-right.png
new file mode 100644 (file)
index 0000000..0f97e2c
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-left.png
new file mode 100644 (file)
index 0000000..62255bf
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-right.png
new file mode 100644 (file)
index 0000000..5089283
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-left.png
new file mode 100644 (file)
index 0000000..7d2f6ab
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-right.png
new file mode 100644 (file)
index 0000000..f616f48
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-right.png differ
index 8f1b4533f2a5e462bb94d701b8d2b5af3095370a..bf4d6e77452a18fb7986d643e2e41b977fac47be 100644 (file)
@@ -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
     {
       "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
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-left.png
new file mode 100644 (file)
index 0000000..6c41a2c
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-right.png
new file mode 100644 (file)
index 0000000..00e4f11
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-left.png
new file mode 100644 (file)
index 0000000..fe4e9e2
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-right.png
new file mode 100644 (file)
index 0000000..8330643
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-left.png
new file mode 100644 (file)
index 0000000..7f70050
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-right.png
new file mode 100644 (file)
index 0000000..ab4dcb9
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-left.png
new file mode 100644 (file)
index 0000000..56837c9
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-right.png
new file mode 100644 (file)
index 0000000..45b370c
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-left.png b/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-left.png
new file mode 100644 (file)
index 0000000..4220089
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-right.png b/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-right.png
new file mode 100644 (file)
index 0000000..d13a758
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-right.png differ
index 290b7dd91ce5ff553c28df0a8dab3b0700678ab9..c2503bb39361aed65922d169d1e3cd811b690fad 100644 (file)
@@ -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
     {
       "name": "rods"
     },
+    {
+      "name": "rods-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "rods-inhand-right",
+      "directions": 4
+    },
     {
       "name": "rods_2"
     },
diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-left.png b/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-left.png
new file mode 100644 (file)
index 0000000..b0e7105
Binary files /dev/null and b/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-right.png b/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-right.png
new file mode 100644 (file)
index 0000000..01b42ad
Binary files /dev/null and b/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-right.png differ
index 5ac5189baed2fcd2083b4e982a4bf93c379e43a5..77f77ee31a25819e8fcfbb26b472942b835f5cce 100644 (file)
@@ -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
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-left.png b/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-left.png
new file mode 100644 (file)
index 0000000..12425e9
Binary files /dev/null and b/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-right.png b/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-right.png
new file mode 100644 (file)
index 0000000..ee1b193
Binary files /dev/null and b/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-right.png differ