From: mubururu_ <139181059+muburu@users.noreply.github.com> Date: Sun, 24 Nov 2024 16:24:13 +0000 (-0600) Subject: various material & ore inhands (#33342) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=cae49ae0d231994b523d4b11855904102544f0cf;p=space-station-14.git 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> --- diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 8371e21c65..e16044b282 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml index fd46fb40be..9d07aed853 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml index 1db564c3b3..700c08e096 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml +++ b/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 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 index 0000000000..b9a381ea13 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 index 0000000000..6d3822309c Binary files /dev/null and b/Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/hide.rsi/meta.json b/Resources/Textures/Objects/Materials/hide.rsi/meta.json index 0ec2b25480..9235e8e2e9 100644 --- a/Resources/Textures/Objects/Materials/hide.rsi/meta.json +++ b/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" } ] -} \ 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 index 0000000000..b936e0fd78 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 index 0000000000..e352e25fc9 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 index 0000000000..07a339dc36 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 index 0000000000..5eb64901c0 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 index 0000000000..fd69f67e5f 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 index 0000000000..58e1ddc53d 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 index 0000000000..22b176f3d3 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 index 0000000000..15c2d61150 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 index 0000000000..28d69ddcd7 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 index 0000000000..a75f4f96e6 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 index 0000000000..ec9184783f 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 index 0000000000..adb73f4284 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 index 0000000000..139c2a573e 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 index 0000000000..4572ed11d5 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json index 3ae12dc14c..9fbad41e48 100644 --- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json +++ b/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" }, 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 index 0000000000..e47685d17c 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 index 0000000000..3225dc0898 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 index 0000000000..01b00bc68f 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 index 0000000000..8c7fddffbd 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 index 0000000000..094a473d89 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 index 0000000000..a8286cdebe 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 index 0000000000..837741af43 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 index 0000000000..0f97e2c9c9 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 index 0000000000..62255bf46b 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 index 0000000000..50892832e0 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 index 0000000000..7d2f6abd57 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 index 0000000000..f616f48f95 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json index 8f1b4533f2..bf4d6e7745 100644 --- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json +++ b/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 } ] } 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 index 0000000000..6c41a2c149 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 index 0000000000..00e4f11408 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 index 0000000000..fe4e9e2d5d 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 index 0000000000..8330643546 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 index 0000000000..7f70050313 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 index 0000000000..ab4dcb98d6 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 index 0000000000..56837c9609 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 index 0000000000..45b370cb8e 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 index 0000000000..422008998b 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 index 0000000000..d13a758cbd Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/meta.json b/Resources/Textures/Objects/Materials/parts.rsi/meta.json index 290b7dd91c..c2503bb393 100644 --- a/Resources/Textures/Objects/Materials/parts.rsi/meta.json +++ b/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" }, 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 index 0000000000..b0e71052cd 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 index 0000000000..01b42adce1 Binary files /dev/null and b/Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/silk.rsi/meta.json b/Resources/Textures/Objects/Materials/silk.rsi/meta.json index 5ac5189bae..77f77ee31a 100644 --- a/Resources/Textures/Objects/Materials/silk.rsi/meta.json +++ b/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 } ] } 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 index 0000000000..12425e93ce 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 index 0000000000..ee1b193af0 Binary files /dev/null and b/Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-right.png differ