From f23e35dc4004decba0bea112ac92b8b9de806f6e Mon Sep 17 00:00:00 2001 From: Swept Date: Fri, 26 Feb 2021 07:59:24 +0000 Subject: [PATCH] Adds tons of new materials + cleans up existing ones (#3413) * RSIs are now banging * Sheets * Hotfix * Last before PR * Ready * Quick * E * Updates everything to new stack PR * Finished off ore, set max stack size to 30 from 50. * Most materials done * Donezo * Adds hides and custom sprited a corgi hide * Should be good * suffix * Bugs * Giff woodplank * Profit? --- .../Components/SharedStackComponent.cs | 2 +- Resources/Maps/saltern.yml | 20 +- .../Catalog/Fills/Items/toolboxes.yml | 4 +- .../Fills/Storage/Crates/materials.yml | 46 ++- .../Prototypes/Catalog/LatheRecipes/sheet.yml | 2 +- .../Catalog/Research/technologies.yml | 6 +- .../Catalog/VendingMachines/hats.yml | 1 - .../Entities/Clothing/Head/misc.yml | 11 - .../Constructible/Furniture/bookshelf.yml | 2 +- .../Constructible/Furniture/tables.yml | 4 +- .../Entities/Constructible/Power/lathe.yml | 4 +- .../Objects/Materials/Sheets/glass.yml | 213 ++++++++++++++ .../Objects/Materials/Sheets/metal.yml | 180 ++++++++++++ .../Objects/Materials/Sheets/other.yml | 156 ++++++++++ .../Entities/Objects/Materials/ingots.yml | 213 ++++++++++++++ .../Entities/Objects/Materials/materials.yml | 277 ++++++++++++++++++ .../Entities/Objects/Materials/ore.yml | 267 +++++++++++++++++ .../Entities/Objects/Materials/parts.yml | 47 +++ .../Objects/{ => Materials}/shards.yml | 2 +- .../Entities/Objects/Misc/material_stacks.yml | 262 ----------------- .../Entities/Objects/Misc/metal_rod.yml | 35 --- .../Entities/Objects/Specific/medical.yml | 1 - .../Prototypes/Reagents/Materials/glass.yml | 45 +++ .../Reagents/Materials/materials.yml | 42 +++ .../Prototypes/Reagents/Materials/metals.yml | 78 +++++ Resources/Prototypes/Reagents/materials.yml | 74 ----- .../Recipes/Construction/Graphs/catwalk.yml | 2 +- .../Recipes/Construction/Graphs/metal_rod.yml | 2 +- .../Recipes/Construction/Graphs/tables.yml | 2 +- .../Recipes/Construction/materials.yml | 2 +- .../Stacks/Materials/Sheets/glass.yml | 35 +++ .../Stacks/Materials/Sheets/metal.yml | 30 ++ .../Stacks/Materials/Sheets/other.yml | 29 ++ .../Prototypes/Stacks/Materials/ingots.yml | 35 +++ .../Prototypes/Stacks/Materials/materials.yml | 53 ++++ Resources/Prototypes/Stacks/Materials/ore.yml | 83 ++++++ .../Prototypes/Stacks/Materials/parts.yml | 5 + .../Prototypes/Stacks/material_stacks.yml | 61 ---- Resources/Prototypes/tags.yml | 9 + .../bear-equipped-HELMET.png} | Bin .../bear-inhand-left.png} | Bin .../bear-inhand-right.png} | Bin .../Misc/hides.rsi/corgi-equipped-HELMET.png | Bin 0 -> 1294 bytes .../Misc/hides.rsi/corgi2-equipped-HELMET.png | Bin 0 -> 1391 bytes .../{bearpelt.rsi => hides.rsi}/meta.json | 17 +- .../glass.rsi}/glass-inhand-left.png | Bin .../glass.rsi}/glass-inhand-right.png | Bin .../Materials/Sheets/glass.rsi/glass.png | Bin 0 -> 699 bytes .../Materials/Sheets/glass.rsi/glass_2.png | Bin 0 -> 964 bytes .../Materials/Sheets/glass.rsi/glass_3.png | Bin 0 -> 1134 bytes .../Materials/Sheets/glass.rsi/meta.json | 109 +++++++ .../Sheets/glass.rsi/pglass-inhand-left.png | Bin 0 -> 309 bytes .../Sheets/glass.rsi/pglass-inhand-right.png | Bin 0 -> 322 bytes .../glass.rsi/pglass.png} | Bin .../Materials/Sheets/glass.rsi/pglass_2.png | Bin 0 -> 934 bytes .../Materials/Sheets/glass.rsi/pglass_3.png | Bin 0 -> 1089 bytes .../plastitaniumglass-inhand-left.png | Bin 0 -> 400 bytes .../plastitaniumglass-inhand-right.png | Bin 0 -> 419 bytes .../Sheets/glass.rsi/plastitaniumglass.png | Bin 0 -> 379 bytes .../Sheets/glass.rsi/plastitaniumglass_2.png | Bin 0 -> 601 bytes .../Sheets/glass.rsi/plastitaniumglass_3.png | Bin 0 -> 722 bytes .../glass.rsi}/rglass-inhand-left.png | Bin .../glass.rsi}/rglass-inhand-right.png | Bin .../glass.rsi}/rglass.png | Bin .../Materials/Sheets/glass.rsi/rglass_2.png | Bin 0 -> 1137 bytes .../Materials/Sheets/glass.rsi/rglass_3.png | Bin 0 -> 1324 bytes .../Sheets/glass.rsi/rpglass-inhand-left.png | Bin 0 -> 425 bytes .../Sheets/glass.rsi/rpglass-inhand-right.png | Bin 0 -> 432 bytes .../Materials/Sheets/glass.rsi/rpglass.png | Bin 0 -> 830 bytes .../Materials/Sheets/glass.rsi/rpglass_2.png | Bin 0 -> 1070 bytes .../Materials/Sheets/glass.rsi/rpglass_3.png | Bin 0 -> 1256 bytes .../glass.rsi/titaniumglass-inhand-left.png | Bin 0 -> 397 bytes .../glass.rsi/titaniumglass-inhand-right.png | Bin 0 -> 376 bytes .../Sheets/glass.rsi/titaniumglass.png | Bin 0 -> 268 bytes .../Sheets/glass.rsi/titaniumglass_2.png | Bin 0 -> 421 bytes .../Sheets/glass.rsi/titaniumglass_3.png | Bin 0 -> 549 bytes .../Sheets/metal.rsi/brass-inhand-left.png | Bin 0 -> 408 bytes .../Sheets/metal.rsi/brass-inhand-right.png | Bin 0 -> 398 bytes .../Materials/Sheets/metal.rsi/brass.png | Bin 0 -> 305 bytes .../Materials/Sheets/metal.rsi/brass_2.png | Bin 0 -> 400 bytes .../Materials/Sheets/metal.rsi/brass_3.png | Bin 0 -> 451 bytes .../Materials/Sheets/metal.rsi/meta.json | 96 ++++++ .../metal.rsi}/plasteel-inhand-left.png | Bin .../metal.rsi}/plasteel-inhand-right.png | Bin .../metal.rsi}/plasteel.png | Bin .../Materials/Sheets/metal.rsi/plasteel_2.png | Bin 0 -> 267 bytes .../Materials/Sheets/metal.rsi/plasteel_3.png | Bin 0 -> 303 bytes .../metal.rsi/plastitanium-inhand-left.png | Bin 0 -> 363 bytes .../metal.rsi/plastitanium-inhand-right.png | Bin 0 -> 327 bytes .../Sheets/metal.rsi/plastitanium.png | Bin 0 -> 252 bytes .../Sheets/metal.rsi/plastitanium_2.png | Bin 0 -> 326 bytes .../Sheets/metal.rsi/plastitanium_3.png | Bin 0 -> 379 bytes .../metal.rsi/steel-inhand-left.png} | Bin .../metal.rsi/steel-inhand-right.png} | Bin .../Materials/Sheets/metal.rsi/steel.png | Bin 0 -> 626 bytes .../Materials/Sheets/metal.rsi/steel_2.png | Bin 0 -> 736 bytes .../Materials/Sheets/metal.rsi/steel_3.png | Bin 0 -> 751 bytes .../Sheets/metal.rsi/titanium-inhand-left.png | Bin 0 -> 361 bytes .../metal.rsi/titanium-inhand-right.png | Bin 0 -> 333 bytes .../Materials/Sheets/metal.rsi/titanium.png | Bin 0 -> 326 bytes .../Materials/Sheets/metal.rsi/titanium_2.png | Bin 0 -> 407 bytes .../Materials/Sheets/metal.rsi/titanium_3.png | Bin 0 -> 457 bytes .../Materials/Sheets/other.rsi/meta.json | 84 ++++++ .../Sheets/other.rsi/paper-inhand-left.png | Bin 0 -> 316 bytes .../Sheets/other.rsi/paper-inhand-right.png | Bin 0 -> 333 bytes .../Materials/Sheets/other.rsi/paper.png | Bin 0 -> 214 bytes .../Materials/Sheets/other.rsi/paper_2.png | Bin 0 -> 285 bytes .../Materials/Sheets/other.rsi/paper_3.png | Bin 0 -> 321 bytes .../other.rsi}/phoron-inhand-left.png | Bin .../other.rsi}/phoron-inhand-right.png | Bin .../other.rsi}/phoron.png | Bin .../Sheets/other.rsi/plasma-inhand-left.png | Bin 0 -> 443 bytes .../Sheets/other.rsi/plasma-inhand-right.png | Bin 0 -> 420 bytes .../other.rsi}/plasma.png | Bin .../Materials/Sheets/other.rsi/plasma_2.png | Bin 0 -> 495 bytes .../Materials/Sheets/other.rsi/plasma_3.png | Bin 0 -> 503 bytes .../other.rsi}/plastic-inhand-left.png | Bin .../other.rsi}/plastic-inhand-right.png | Bin .../Materials/Sheets/other.rsi/plastic.png | Bin 0 -> 240 bytes .../Materials/Sheets/other.rsi/plastic_2.png | Bin 0 -> 287 bytes .../Materials/Sheets/other.rsi/plastic_3.png | Bin 0 -> 307 bytes .../Sheets/other.rsi/uranium-inhand-left.png | Bin 0 -> 478 bytes .../Sheets/other.rsi/uranium-inhand-right.png | Bin 0 -> 445 bytes .../other.rsi}/uranium.png | Bin .../{sheets.rsi => Sheets}/researchicon.png | Bin .../ingots.rsi/adamantine-inhand-left.png | Bin 0 -> 352 bytes .../ingots.rsi/adamantine-inhand-right.png | Bin 0 -> 355 bytes .../Materials/ingots.rsi/adamantine.png | Bin 0 -> 259 bytes .../Materials/ingots.rsi/adamantine_2.png | Bin 0 -> 361 bytes .../Materials/ingots.rsi/adamantine_3.png | Bin 0 -> 450 bytes .../Objects/Materials/ingots.rsi/alpha.png | Bin 0 -> 230 bytes .../Objects/Materials/ingots.rsi/alpha_2.png | Bin 0 -> 359 bytes .../Objects/Materials/ingots.rsi/alpha_3.png | Bin 0 -> 384 bytes .../ingots.rsi/copper-inhand-left.png | Bin 0 -> 315 bytes .../ingots.rsi/copper-inhand-right.png | Bin 0 -> 276 bytes .../copper.png} | Bin .../Objects/Materials/ingots.rsi/copper_2.png | Bin 0 -> 276 bytes .../Objects/Materials/ingots.rsi/copper_3.png | Bin 0 -> 342 bytes .../Materials/ingots.rsi/gold-inhand-left.png | Bin 0 -> 302 bytes .../ingots.rsi/gold-inhand-right.png | Bin 0 -> 283 bytes .../Objects/Materials/ingots.rsi/gold.png | Bin 0 -> 264 bytes .../Objects/Materials/ingots.rsi/gold_2.png | Bin 0 -> 379 bytes .../Objects/Materials/ingots.rsi/gold_3.png | Bin 0 -> 438 bytes .../ingots.rsi/hydrogen-inhand-left.png | Bin 0 -> 345 bytes .../ingots.rsi/hydrogen-inhand-right.png | Bin 0 -> 334 bytes .../Objects/Materials/ingots.rsi/hydrogen.png | Bin 0 -> 168 bytes .../Materials/ingots.rsi/hydrogen_2.png | Bin 0 -> 372 bytes .../Materials/ingots.rsi/hydrogen_3.png | Bin 0 -> 437 bytes .../Materials/ingots.rsi/iron-inhand-left.png | Bin 0 -> 310 bytes .../ingots.rsi/iron-inhand-right.png | Bin 0 -> 306 bytes .../Objects/Materials/ingots.rsi/iron.png | Bin 0 -> 168 bytes .../Objects/Materials/ingots.rsi/iron_2.png | Bin 0 -> 309 bytes .../Objects/Materials/ingots.rsi/iron_3.png | Bin 0 -> 377 bytes .../Objects/Materials/ingots.rsi/meta.json | 122 ++++++++ .../ingots.rsi/silver-inhand-left.png | Bin 0 -> 293 bytes .../ingots.rsi/silver-inhand-right.png | Bin 0 -> 302 bytes .../Objects/Materials/ingots.rsi/silver.png | Bin 0 -> 236 bytes .../Objects/Materials/ingots.rsi/silver_2.png | Bin 0 -> 332 bytes .../Objects/Materials/ingots.rsi/silver_3.png | Bin 0 -> 411 bytes .../{banananium.png => bananium.png} | Bin .../Materials/materials.rsi/bearpelt.png} | Bin .../Objects/Materials/materials.rsi/cloth.png | Bin 0 -> 947 bytes .../Materials/materials.rsi/cloth_2.png | Bin 0 -> 1105 bytes .../Materials/materials.rsi/cloth_3.png | Bin 0 -> 1177 bytes .../Materials/materials.rsi/cotton.png | Bin 0 -> 275 bytes .../Materials/materials.rsi/cotton_2.png | Bin 0 -> 321 bytes .../Materials/materials.rsi/cotton_3.png | Bin 0 -> 399 bytes .../materials.rsi/diamond-inhand-left.png | Bin 0 -> 223 bytes .../materials.rsi/diamond-inhand-right.png | Bin 0 -> 231 bytes .../Materials/materials.rsi/durathread.png | Bin 0 -> 235 bytes .../Materials/materials.rsi/durathread_2.png | Bin 0 -> 287 bytes .../Materials/materials.rsi/durathread_3.png | Bin 0 -> 346 bytes .../Materials/materials.rsi/durathreadraw.png | Bin 0 -> 349 bytes .../materials.rsi/durathreadraw_2.png | Bin 0 -> 420 bytes .../materials.rsi/durathreadraw_3.png | Bin 0 -> 486 bytes .../Materials/materials.rsi/goldbar_10.png | Bin 220 -> 0 bytes .../Materials/materials.rsi/goldbar_20.png | Bin 393 -> 0 bytes .../Materials/materials.rsi/goldbar_30.png | Bin 445 -> 0 bytes .../Objects/Materials/materials.rsi/hide.png | Bin 0 -> 770 bytes .../Materials/materials.rsi/hide_2.png | Bin 0 -> 986 bytes .../Materials/materials.rsi/hide_3.png | Bin 0 -> 1065 bytes .../materials.rsi/leadbar_single.png | Bin 215 -> 0 bytes .../Materials/materials.rsi/leather.png | Bin 0 -> 710 bytes .../Materials/materials.rsi/leather_2.png | Bin 0 -> 894 bytes .../Materials/materials.rsi/leather_3.png | Bin 0 -> 936 bytes .../Objects/Materials/materials.rsi/meta.json | 188 +++++++----- ...nt_phoron_gem.png => phoron_gem_spent.png} | Bin .../Materials/materials.rsi/phoron_sheet.png | Bin 460 -> 0 bytes .../Materials/materials.rsi/plastic.png | Bin 256 -> 0 bytes .../Objects/Materials/materials.rsi/rods.png | Bin 221 -> 0 bytes .../materials.rsi/steelbar_single.png | Bin 207 -> 0 bytes .../Materials/materials.rsi/tinbar_single.png | Bin 216 -> 0 bytes .../materials.rsi/wood-inhand-left.png | Bin 0 -> 435 bytes .../materials.rsi/wood-inhand-right.png | Bin 0 -> 461 bytes .../Objects/Materials/materials.rsi/wool.png | Bin 1215 -> 0 bytes .../Objects/Materials/ore.rsi/adamantine.png | Bin 0 -> 428 bytes .../Objects/Materials/ore.rsi/ammonia.png | Bin 0 -> 191 bytes .../Objects/Materials/ore.rsi/bananium.png | Bin 0 -> 286 bytes .../Objects/Materials/ore.rsi/diamond.png | Bin 0 -> 190 bytes .../Objects/Materials/ore.rsi/gold.png | Bin 0 -> 354 bytes .../Objects/Materials/ore.rsi/iron.png | Bin 0 -> 230 bytes .../Objects/Materials/ore.rsi/meta.json | 53 ++++ .../phoron_ore.png => ore.rsi/phoron.png} | Bin .../plasma_ore.png => ore.rsi/plasma.png} | Bin .../Objects/Materials/ore.rsi/sand.png | Bin 0 -> 374 bytes .../Objects/Materials/ore.rsi/sand_black.png | Bin 0 -> 284 bytes .../Objects/Materials/ore.rsi/silver.png | Bin 0 -> 396 bytes .../Objects/Materials/ore.rsi/slag.png | Bin 0 -> 168 bytes .../Objects/Materials/ore.rsi/titanium.png | Bin 0 -> 338 bytes .../Objects/Materials/ore.rsi/uranium.png | Bin 0 -> 352 bytes .../Objects/Materials/parts.rsi/meta.json | 26 ++ .../Objects/Materials/parts.rsi/rods.png | Bin 0 -> 197 bytes .../Objects/Materials/parts.rsi/rods_2.png | Bin 0 -> 235 bytes .../Objects/Materials/parts.rsi/rods_3.png | Bin 0 -> 262 bytes .../Objects/Materials/parts.rsi/rods_4.png | Bin 0 -> 272 bytes .../Objects/Materials/parts.rsi/rods_5.png | Bin 0 -> 283 bytes .../Objects/Materials/sheets.rsi/glass.png | Bin 781 -> 0 bytes .../Objects/Materials/sheets.rsi/meta.json | 84 ------ .../Objects/Materials/sheets.rsi/metal.png | Bin 883 -> 0 bytes .../Objects/Materials/sheets.rsi/plastic.png | Bin 256 -> 0 bytes RobustToolbox | 2 +- 221 files changed, 2458 insertions(+), 665 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml create mode 100644 Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml create mode 100644 Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml create mode 100644 Resources/Prototypes/Entities/Objects/Materials/ingots.yml create mode 100644 Resources/Prototypes/Entities/Objects/Materials/materials.yml create mode 100644 Resources/Prototypes/Entities/Objects/Materials/ore.yml create mode 100644 Resources/Prototypes/Entities/Objects/Materials/parts.yml rename Resources/Prototypes/Entities/Objects/{ => Materials}/shards.yml (98%) delete mode 100644 Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Misc/metal_rod.yml create mode 100644 Resources/Prototypes/Reagents/Materials/glass.yml create mode 100644 Resources/Prototypes/Reagents/Materials/materials.yml create mode 100644 Resources/Prototypes/Reagents/Materials/metals.yml delete mode 100644 Resources/Prototypes/Reagents/materials.yml create mode 100644 Resources/Prototypes/Stacks/Materials/Sheets/glass.yml create mode 100644 Resources/Prototypes/Stacks/Materials/Sheets/metal.yml create mode 100644 Resources/Prototypes/Stacks/Materials/Sheets/other.yml create mode 100644 Resources/Prototypes/Stacks/Materials/ingots.yml create mode 100644 Resources/Prototypes/Stacks/Materials/materials.yml create mode 100644 Resources/Prototypes/Stacks/Materials/ore.yml create mode 100644 Resources/Prototypes/Stacks/Materials/parts.yml delete mode 100644 Resources/Prototypes/Stacks/material_stacks.yml rename Resources/Textures/Clothing/Head/Misc/{bearpelt.rsi/equipped-HELMET.png => hides.rsi/bear-equipped-HELMET.png} (100%) rename Resources/Textures/Clothing/Head/Misc/{bearpelt.rsi/inhand-left.png => hides.rsi/bear-inhand-left.png} (100%) rename Resources/Textures/Clothing/Head/Misc/{bearpelt.rsi/inhand-right.png => hides.rsi/bear-inhand-right.png} (100%) create mode 100644 Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET.png rename Resources/Textures/Clothing/Head/Misc/{bearpelt.rsi => hides.rsi}/meta.json (59%) rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/glass.rsi}/glass-inhand-left.png (100%) rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/glass.rsi}/glass-inhand-right.png (100%) create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-right.png rename Resources/Textures/Objects/Materials/{sheets.rsi/plasmaglass.png => Sheets/glass.rsi/pglass.png} (100%) create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/glass.rsi}/rglass-inhand-left.png (100%) rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/glass.rsi}/rglass-inhand-right.png (100%) rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/glass.rsi}/rglass.png (100%) create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_3.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/metal.rsi}/plasteel-inhand-left.png (100%) rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/metal.rsi}/plasteel-inhand-right.png (100%) rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/metal.rsi}/plasteel.png (100%) create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_3.png rename Resources/Textures/Objects/Materials/{sheets.rsi/metal-inhand-left.png => Sheets/metal.rsi/steel-inhand-left.png} (100%) rename Resources/Textures/Objects/Materials/{sheets.rsi/metal-inhand-right.png => Sheets/metal.rsi/steel-inhand-right.png} (100%) create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/paper.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_3.png rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/other.rsi}/phoron-inhand-left.png (100%) rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/other.rsi}/phoron-inhand-right.png (100%) rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/other.rsi}/phoron.png (100%) create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-right.png rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/other.rsi}/plasma.png (100%) create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/other.rsi}/plastic-inhand-left.png (100%) rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets/other.rsi}/plastic-inhand-right.png (100%) create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-right.png rename Resources/Textures/Objects/Materials/{materials.rsi => Sheets/other.rsi}/uranium.png (100%) rename Resources/Textures/Objects/Materials/{sheets.rsi => Sheets}/researchicon.png (100%) create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/adamantine.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/adamantine_2.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/adamantine_3.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/alpha.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/alpha_3.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/copper-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/copper-inhand-right.png rename Resources/Textures/Objects/Materials/{materials.rsi/copperbar_single.png => ingots.rsi/copper.png} (100%) create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/copper_2.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/copper_3.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/gold.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/hydrogen-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/hydrogen-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/hydrogen.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/hydrogen_2.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/hydrogen_3.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/iron-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/iron-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/iron.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/iron_2.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/iron_3.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/meta.json create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/silver.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png create mode 100644 Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png rename Resources/Textures/Objects/Materials/materials.rsi/{banananium.png => bananium.png} (100%) rename Resources/Textures/{Clothing/Head/Misc/bearpelt.rsi/icon.png => Objects/Materials/materials.rsi/bearpelt.png} (100%) create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/cloth.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/cotton.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/cotton_2.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/cotton_3.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/durathread.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/durathread_2.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/durathread_3.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/durathreadraw.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/durathreadraw_2.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/durathreadraw_3.png delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/goldbar_10.png delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/goldbar_20.png delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/goldbar_30.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/hide.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/hide_2.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/hide_3.png delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/leadbar_single.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/leather.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/leather_2.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/leather_3.png rename Resources/Textures/Objects/Materials/materials.rsi/{spent_phoron_gem.png => phoron_gem_spent.png} (100%) delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/phoron_sheet.png delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/plastic.png delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/rods.png delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/steelbar_single.png delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/tinbar_single.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/wood-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/wood-inhand-right.png delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/wool.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/adamantine.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/ammonia.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/bananium.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/diamond.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/gold.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/iron.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/meta.json rename Resources/Textures/Objects/Materials/{materials.rsi/phoron_ore.png => ore.rsi/phoron.png} (100%) rename Resources/Textures/Objects/Materials/{materials.rsi/plasma_ore.png => ore.rsi/plasma.png} (100%) create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/sand.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/sand_black.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/silver.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/slag.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/titanium.png create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Materials/parts.rsi/meta.json create mode 100644 Resources/Textures/Objects/Materials/parts.rsi/rods.png create mode 100644 Resources/Textures/Objects/Materials/parts.rsi/rods_2.png create mode 100644 Resources/Textures/Objects/Materials/parts.rsi/rods_3.png create mode 100644 Resources/Textures/Objects/Materials/parts.rsi/rods_4.png create mode 100644 Resources/Textures/Objects/Materials/parts.rsi/rods_5.png delete mode 100644 Resources/Textures/Objects/Materials/sheets.rsi/glass.png delete mode 100644 Resources/Textures/Objects/Materials/sheets.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Materials/sheets.rsi/metal.png delete mode 100644 Resources/Textures/Objects/Materials/sheets.rsi/plastic.png diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs index 5fd0406037..6d73b68403 100644 --- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs @@ -57,7 +57,7 @@ namespace Content.Shared.GameObjects.Components public override void ExposeData(ObjectSerializer serializer) { - serializer.DataFieldCached(ref _maxCount, "max", 50); + serializer.DataFieldCached(ref _maxCount, "max", 30); serializer.DataFieldCached(ref _count, "count", MaxCount); if (serializer.Writing) diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index c76feca824..edc90b9efd 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -12466,7 +12466,7 @@ entities: - parent: 1044 type: Transform - uid: 876 - type: GlassSheet1 + type: SheetGlass1 components: - parent: 1044 type: Transform @@ -13747,8 +13747,8 @@ entities: - Ointment - LightTube - LightBulb - - MetalStack - - GlassStack + - SheetSteel + - SheetGlass type: ProtolatheDatabase - containers: machine_board: @@ -13777,8 +13777,8 @@ entities: - Ointment - LightTube - LightBulb - - MetalStack - - GlassStack + - SheetSteel + - SheetGlass type: LatheDatabase - containers: machine_board: @@ -21277,7 +21277,7 @@ entities: rot: 3.141592697301183 rad type: Transform - uid: 1937 - type: GoldStack + type: IngotGold components: - parent: 853 pos: -2.615473,16.701466 @@ -35551,7 +35551,7 @@ entities: type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 3927 - type: MetalStack + type: SheetSteel components: - parent: 853 pos: 47.585052,4.443361 @@ -35614,21 +35614,21 @@ entities: rot: 4.371139006309477E-08 rad type: Transform - uid: 3936 - type: GlassStack + type: SheetGlass components: - parent: 853 pos: 49.131927,4.677736 rot: 4.371139006309477E-08 rad type: Transform - uid: 3937 - type: GlassStack + type: SheetGlass components: - parent: 853 pos: 48.788177,4.505861 rot: 4.371139006309477E-08 rad type: Transform - uid: 3938 - type: MetalStack + type: SheetSteel components: - parent: 853 pos: 48.038177,4.677736 diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index d666245826..a0d00475b2 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -60,10 +60,10 @@ components: - type: StorageFill contents: - - name: GoldStack + - name: IngotGold amount: 5 - name: DrinkGoldenCup prob: 0.05 orGroup: CupOrGold - - name: GoldStack + - name: IngotGold orGroup: CupOrGold diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml index 5e592679ce..e4c5198bf9 100644 --- a/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml +++ b/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml @@ -5,7 +5,7 @@ components: - type: StorageFill contents: - - name: GlassStack + - name: SheetGlass amount: 1 - type: entity @@ -15,7 +15,7 @@ components: - type: StorageFill contents: - - name: MetalStack + - name: SheetSteel amount: 1 - type: entity @@ -25,8 +25,8 @@ components: - type: StorageFill contents: - - name: WoodPlank - amount: 15 + - name: MaterialWoodPlank + amount: 1 - type: entity id: CrateMaterialsFuelTank @@ -68,24 +68,22 @@ # - name: WaterTankFull # amount: 1 -# Unimplemented Materials +- type: entity + id: CrateMaterialsPlastic + name: plastics crate + parent: CrateGenericonimo + components: + - type: StorageFill + contents: + - name: SheetPlastic + amount: 1 -#- type: entity -# id: CrateMaterialsPlastic -# name: plastics crate -# parent: CrateGenericonimo -# components: -# - type: StorageFill -# contents: -# - name: PlasticStack -# amount: 1 - -#- type: entity -# id: CrateMaterialsPlasteel -# name: plasteel crate -# parent: CrateGenericonimo -# components: -# - type: StorageFill -# contents: -# - name: PlasteelStack -# amount: 1 +- type: entity + id: CrateMaterialsPlasteel + name: plasteel crate + parent: CrateGenericonimo + components: + - type: StorageFill + contents: + - name: SheetPlasteel + amount: 1 diff --git a/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml index b2bc1ee6f7..40ea4d365e 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml @@ -1,5 +1,5 @@ - type: latheRecipe - id: MetalStack + id: SheetSteel icon: sprite: Objects/Materials/sheets.rsi state: metal diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index c80b3fd010..5d25606523 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -149,14 +149,12 @@ name: material sheet printing id: Sheets description: Print those sheets! - icon: - sprite: Objects/Materials/sheets.rsi - state: researchicon + icon: Objects/Materials/Sheets/researchicon.png requiredPoints: 250 requiredTechnologies: - IndustrialEngineering unlockedRecipes: - - MetalStack + - SheetSteel - GlassStack # Electromagnetic Theory Technology Tree diff --git a/Resources/Prototypes/Catalog/VendingMachines/hats.yml b/Resources/Prototypes/Catalog/VendingMachines/hats.yml index 4b3594640a..3daca32b71 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/hats.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/hats.yml @@ -10,7 +10,6 @@ HatBandGreen: 3 HatBandRed: 3 HatBandSkull: 3 - ClothingHeadHatBearpelt: 3 ClothingHeadHatBeret: 3 ClothingHeadHatBluesoft: 3 ClothingHeadHatBluesoftFlipped: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 04590a0e93..e43ae9ffc5 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -1,14 +1,3 @@ -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatBearpelt - name: bear pelt - description: It's a cute bear pelt. - components: - - type: Sprite - sprite: Clothing/Head/Misc/bearpelt.rsi - - type: Clothing - sprite: Clothing/Head/Misc/bearpelt.rsi - - type: entity parent: ClothingHeadBase id: ClothingHeadHatBunny diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml index 774d9252dd..658e652990 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml @@ -31,7 +31,7 @@ sound: /Audio/Effects/woodhit.ogg - !type:SpawnEntitiesBehavior spawn: - WoodPlank: + MaterialWoodPlank: min: 1 max: 1 - !type:DoActsBehavior diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml index 62750b1bcc..3bc3a1c2b7 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml @@ -258,7 +258,7 @@ sound: /Audio/Effects/woodhit.ogg - !type:SpawnEntitiesBehavior spawn: - WoodPlank: + MaterialWoodPlank: min: 1 max: 1 - !type:DoActsBehavior @@ -289,7 +289,7 @@ sound: /Audio/Effects/woodhit.ogg - !type:SpawnEntitiesBehavior spawn: - WoodPlank: + MaterialWoodPlank: min: 1 max: 1 - !type:DoActsBehavior diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml index 55f9940020..ff1f14657a 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml @@ -80,7 +80,7 @@ - Ointment - LightTube - LightBulb - - MetalStack + - SheetSteel - GlassStack - Wirecutter - Screwdriver @@ -145,7 +145,7 @@ - Ointment - LightTube - LightBulb - - MetalStack + - SheetSteel - GlassStack - Wirecutter - Screwdriver diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml new file mode 100644 index 0000000000..ad7fa7389e --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml @@ -0,0 +1,213 @@ +- type: entity + id: SheetGlassBase + abstract: true + parent: BaseItem + description: A sheet of glass, used often on the station in various applications. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/Sheets/glass.rsi + - type: Item + sprite: Objects/Materials/Sheets/glass.rsi + - type: ItemStatus + - type: Tag + tags: + - Sheet + +- type: entity + name: glass + id: SheetGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: glass + - type: Stack + stackType: Glass + - type: Sprite + state: glass_3 + - type: Item + HeldPrefix: glass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - glass + - glass_2 + - glass_3 + +- type: entity + id: SheetGlass1 + name: glass + parent: SheetGlass + components: + - type: Sprite + state: glass + - type: Stack + count: 1 + +- type: entity + name: reinforced glass + id: SheetRGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: rglass + - type: Stack + stackType: ReinforcedGlass + - type: Sprite + state: rglass_3 + - type: Item + HeldPrefix: rglass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - rglass + - rglass_2 + - rglass_3 + +- type: entity + id: SheetRGlass1 + name: reinforced glass + parent: SheetRGlass + components: + - type: Sprite + state: rglass + - type: Stack + count: 1 + +- type: entity + name: plasma glass + id: SheetPGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: pglass + - type: Stack + stackType: PlasmaGlass + - type: Sprite + state: pglass_3 + - type: Item + HeldPrefix: pglass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - pglass + - pglass_2 + - pglass_3 + +- type: entity + id: SheetPGlass1 + name: plasma glass + parent: SheetPGlass + components: + - type: Sprite + state: pglass + - type: Stack + count: 1 + +- type: entity + name: reinforced plasma glass + id: SheetRPGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: rpglass + - type: Stack + stackType: ReinforcedPlasmaGlass + - type: Sprite + state: rpglass_3 + - type: Item + HeldPrefix: rpglass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - rpglass + - rpglass_2 + - rpglass_3 + +- type: entity + id: SheetRPGlass1 + name: reinforced plasma glass + parent: SheetPGlass + components: + - type: Sprite + state: rpglass + - type: Stack + count: 1 + +- type: entity + name: titanium glass + id: SheetTitaniumGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: titaniumglass + - type: Stack + stackType: TitaniumGlass + - type: Sprite + state: titaniumglass_3 + - type: Item + HeldPrefix: titaniumglass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - titaniumglass + - titaniumglass_2 + - titaniumglass_3 + +- type: entity + id: SheetTitaniumGlass1 + name: titanium glass + parent: SheetTitaniumGlass + components: + - type: Sprite + state: titaniumglass + - type: Stack + count: 1 + +- type: entity + name: plastitanium glass + id: SheetPlastitaniumGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: plastitaniumglass + - type: Stack + stackType: PlastitaniumGlass + - type: Sprite + state: plastitaniumglass_3 + - type: Item + HeldPrefix: plastitaniumglass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - plastitaniumglass + - plastitaniumglass_2 + - plastitaniumglass_3 + +- type: entity + id: SheetPlastitaniumGlass1 + name: plastitanium glass + parent: SheetPlastitaniumGlass + components: + - type: Sprite + state: plastitaniumglass + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml new file mode 100644 index 0000000000..888fc2b6c5 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -0,0 +1,180 @@ +- type: entity + id: SheetMetalBase + abstract: true + parent: BaseItem + description: A sheet of metal, used often on the station in various applications. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/Sheets/metal.rsi + - type: Item + sprite: Objects/Materials/Sheets/metal.rsi + - type: ItemStatus + - type: Tag + tags: + - Sheet + +- type: entity + name: steel + id: SheetSteel + parent: SheetMetalBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: steel + - type: Stack + stackType: Steel + - type: Sprite + state: steel_3 + - type: Item + HeldPrefix: steel + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - steel + - steel_2 + - steel_3 + +- type: entity + id: SheetSteel1 + name: steel + parent: SheetSteel + components: + - type: Sprite + state: steel + - type: Stack + count: 1 + +- type: entity + name: plasteel + id: SheetPlasteel + parent: SheetMetalBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: plasteel + - type: Stack + stackType: Plasteel + - type: Sprite + state: plasteel_3 + - type: Item + HeldPrefix: plasteel + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - plasteel + - plasteel_2 + - plasteel_3 + +- type: entity + id: SheetPlasteel1 + name: plasteel + parent: SheetPlasteel + components: + - type: Sprite + state: plasteel + - type: Stack + count: 1 + +- type: entity + name: titanium + id: SheetTitanium + parent: SheetMetalBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: titanium + - type: Stack + stackType: Titanium + - type: Sprite + state: titanium_3 + - type: Item + HeldPrefix: titanium + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - titanium + - titanium_2 + - titanium_3 + +- type: entity + id: SheetTitanium1 + name: titanium + parent: SheetTitanium + components: + - type: Sprite + state: titanium + - type: Stack + count: 1 + +- type: entity + name: plastitanium + id: SheetPlastitanium + parent: SheetMetalBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: plastitanium + - type: Stack + stackType: Plastitanium + - type: Sprite + state: plastitanium_3 + - type: Item + HeldPrefix: plastitanium + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - plastitanium + - plastitanium_2 + - plastitanium_3 + +- type: entity + id: SheetPlastitanium1 + name: plastitanium + parent: SheetPlastitanium + components: + - type: Sprite + state: plastitanium + - type: Stack + count: 1 + +- type: entity + name: brass + id: SheetBrass + parent: SheetMetalBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: brass + - type: Stack + stackType: Brass + - type: Sprite + state: brass_3 + - type: Item + HeldPrefix: brass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - brass + - brass_2 + - brass_3 + +- type: entity + id: SheetBrass1 + name: brass + parent: SheetBrass + components: + - type: Sprite + state: brass + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml new file mode 100644 index 0000000000..e7fd072cac --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -0,0 +1,156 @@ +- type: entity + id: SheetOtherBase + abstract: true + parent: BaseItem + description: A sheet of material, used often on the station in various applications. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/Sheets/other.rsi + - type: Item + sprite: Objects/Materials/Sheets/other.rsi + - type: ItemStatus + - type: Tag + tags: + - Sheet + +- type: entity + name: paper + id: SheetPaper + parent: SheetOtherBase + components: + - type: Stack + stackType: Paper + - type: Sprite + state: paper_3 + - type: Item + HeldPrefix: paper + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - paper + - paper_2 + - paper_3 + +- type: entity + id: SheetPaper1 + name: paper + parent: SheetPaper + components: + - type: Sprite + state: paper + - type: Stack + count: 1 + +- type: entity + name: phoron + id: SheetPhoron + parent: SheetOtherBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: phoron + - type: Stack + stackType: Phoron + - type: Sprite + state: phoron + - type: Item + HeldPrefix: phoron + +- type: entity + id: SheetPhoron1 + name: phoron + parent: SheetPhoron + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: plasma + id: SheetPlasma + parent: SheetOtherBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: plasma + - type: Stack + stackType: Plasma + - type: Sprite + state: plasma_3 + - type: Item + HeldPrefix: plasma + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - plasma + - plasma_2 + - plasma_3 + +- type: entity + id: SheetPlasma1 + name: plasma + parent: SheetPlasma + components: + - type: Sprite + state: plasma + - type: Stack + count: 1 + +- type: entity + name: plastic + id: SheetPlastic + parent: SheetOtherBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: plastic + - type: Stack + stackType: Plastic + - type: Sprite + state: plastic_3 + - type: Item + HeldPrefix: plastic + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - plastic + - plastic_2 + - plastic_3 + +- type: entity + id: SheetPlastic1 + name: plastic + parent: SheetPlastic + components: + - type: Sprite + state: plastic + - type: Stack + count: 1 + +- type: entity + name: uranium + id: SheetUranium + parent: SheetOtherBase + components: + - type: Stack + stackType: Uranium + - type: Sprite + state: uranium + - type: Item + HeldPrefix: uranium + +- type: entity + id: SheetUranium1 + name: uranium + parent: SheetUranium + suffix: 1 + components: + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml new file mode 100644 index 0000000000..c1945e8a15 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml @@ -0,0 +1,213 @@ +- type: entity + id: IngotBase + abstract: true + parent: BaseItem + description: A heavy metal ingot stamped with the Nanotransen logo. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/ingots.rsi + - type: Item + sprite: Objects/Materials/ingots.rsi + - type: ItemStatus + - type: Tag + tags: + - Ingot + +- type: entity + name: adamantine bar + id: IngotAdamantine + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: adamantine + - type: Stack + stackType: Adamantine + - type: Sprite + state: adamantine_3 + - type: Item + HeldPrefix: adamantine + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - adamantine + - adamantine_2 + - adamantine_3 + +- type: entity + id: IngotAdamantine1 + name: adamantine bar + parent: IngotAdamantine + components: + - type: Sprite + state: adamantine + - type: Stack + count: 1 + +- type: entity + name: copper bar + id: IngotCopper + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: copper + - type: Stack + stackType: Copper + - type: Sprite + state: copper_3 + - type: Item + HeldPrefix: copper + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - copper + - copper_2 + - copper_3 + +- type: entity + id: IngotCopper1 + name: copper bar + parent: IngotCopper + components: + - type: Sprite + state: copper + - type: Stack + count: 1 + +- type: entity + name: gold bar + id: IngotGold + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: gold + - type: Stack + stackType: Gold + - type: Sprite + state: gold_3 + - type: Item + HeldPrefix: gold + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - gold + - gold_2 + - gold_3 + +- type: entity + id: IngotGold1 + name: gold bar + parent: IngotGold + components: + - type: Sprite + state: gold + - type: Stack + count: 1 + +- type: entity + name: hydrogen bar + id: IngotHydrogen + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: hydrogen + - type: Stack + stackType: Hydrogen + - type: Sprite + state: hydrogen_3 + - type: Item + HeldPrefix: hydrogen + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - hydrogen + - hydrogen_2 + - hydrogen_3 + +- type: entity + id: IngotHydrogen1 + name: hydrogen bar + parent: IngotHydrogen + components: + - type: Sprite + state: hydrogen + - type: Stack + count: 1 + +- type: entity + name: iron bar + id: IngotIron + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: iron + - type: Stack + stackType: Iron + - type: Sprite + state: iron_3 + - type: Item + HeldPrefix: iron + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - iron + - iron_2 + - iron_3 + +- type: entity + id: IngotIron1 + name: iron bar + parent: IngotIron + components: + - type: Sprite + state: iron + - type: Stack + count: 1 + +- type: entity + name: silver bar + id: IngotSilver + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: silver + - type: Stack + stackType: Silver + - type: Sprite + state: silver_3 + - type: Item + HeldPrefix: silver + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - silver + - silver_2 + - silver_3 + +- type: entity + id: IngotSilver1 + name: silver bar + parent: IngotSilver + components: + - type: Sprite + state: silver + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml new file mode 100644 index 0000000000..5b9cfc52e9 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -0,0 +1,277 @@ +- type: entity + id: MaterialBase + abstract: true + parent: BaseItem + description: A raw material. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/materials.rsi + - type: Item + sprite: Objects/Materials/materials.rsi + - type: ItemStatus + +- type: entity + name: bananium + id: MaterialBananium + parent: MaterialBase + components: + - type: Stack + stackType: Bananium + - type: Sprite + state: bananium + +- type: entity + id: MaterialBananium1 + parent: MaterialBananium + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: cloth + id: MaterialCloth + parent: MaterialBase + components: + - type: Stack + stackType: Cloth + - type: Sprite + state: cloth_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - cloth + - cloth_2 + - cloth_3 + +- type: entity + id: MaterialCloth1 + parent: MaterialCloth + components: + - type: Sprite + state: cloth + - type: Stack + count: 1 + +- type: entity + name: cotton + id: MaterialCotton + parent: MaterialBase + components: + - type: Stack + stackType: Cotton + - type: Sprite + state: cotton_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - cotton + - cotton_2 + - cotton_3 + +- type: entity + id: MaterialCotton1 + parent: MaterialCotton + components: + - type: Sprite + state: cotton + - type: Stack + count: 1 + +- type: entity + name: refined diamond + id: MaterialDiamond + parent: MaterialBase + components: + - type: Stack + stackType: Diamond + - type: Sprite + state: diamond + - type: Item + HeldPrefix: diamond + +- type: entity + id: MaterialDiamond1 + parent: MaterialDiamond + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: durathread + id: MaterialDurathread + parent: MaterialBase + components: + - type: Stack + stackType: Durathread + - type: Sprite + state: durathread_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - durathread + - durathread_2 + - durathread_3 + +- type: entity + id: MaterialDurathread1 + parent: MaterialDurathread + components: + - type: Sprite + state: durathread + - type: Stack + count: 1 + +- type: entity + name: raw durathread + id: MaterialDurathreadRaw + parent: MaterialBase + components: + - type: Stack + stackType: RawDurathread + - type: Sprite + state: durathreadraw_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - durathreadraw + - durathreadraw_2 + - durathreadraw_3 + +- type: entity + id: MaterialDurathreadRaw1 + parent: MaterialDurathreadRaw + components: + - type: Sprite + state: durathreadraw + - type: Stack + count: 1 + +- type: entity + name: hide + id: MaterialHide + parent: MaterialBase + components: + - type: Stack + stackType: Hide + - type: Sprite + state: hide_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - hide + - hide_2 + - hide_3 + +- type: entity + id: MaterialHide1 + parent: MaterialHide + components: + - type: Sprite + state: hide + - type: Stack + count: 1 + +- type: entity + name: leather + id: MaterialLeather + parent: MaterialBase + components: + - type: Stack + stackType: Leather + - type: Sprite + state: leather_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - leather + - leather_2 + - leather_3 + +- type: entity + id: MaterialLeather1 + parent: MaterialLeather + components: + - type: Sprite + state: leather + - type: Stack + count: 1 + +- type: entity + name: wood + id: MaterialWoodPlank + parent: MaterialBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: wood + - type: Stack + stackType: WoodPlank + - type: Sprite + state: wood + - type: Item + HeldPrefix: wood + +- type: entity + id: MaterialWoodPlank1 + parent: MaterialWoodPlank + suffix: 1 + components: + - type: Stack + count: 1 + +# Specific Hides + +- type: entity + name: bear hide + id: MaterialHideBear + parent: MaterialBase + components: + - type: Sprite + sprite: Objects/Materials/materials.rsi + state: bearpelt + - type: Clothing + sprite: Clothing/Head/Misc/hides.rsi + HeldPrefix: bear + ClothingPrefix: bear + Slots: + - Helmet + +- type: entity + name: cat hide + id: MaterialHideCat + parent: MaterialBase + components: + - type: Sprite + sprite: Objects/Materials/materials.rsi + state: cathide + # - type: Clothing + # sprite: Clothing/Head/Misc/hides.rsi + # HeldPrefix: cat + # ClothingPrefix: cat + # Slots: + # - Helmet + +- type: entity + name: corgi hide + id: MaterialHideCorgi + parent: MaterialBase + components: + - type: Sprite + sprite: Objects/Materials/materials.rsi + state: corgihide + - type: Clothing + sprite: Clothing/Head/Misc/hides.rsi + # HeldPrefix: corgi + ClothingPrefix: corgi2 + Slots: + - Helmet diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml new file mode 100644 index 0000000000..f5e7173ce3 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml @@ -0,0 +1,267 @@ +- type: entity + id: OreBase + abstract: true + parent: BaseItem + description: A piece of unrefined ore. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/ore.rsi + - type: Item + sprite: Objects/Materials/ore.rsi + - type: ItemStatus + - type: Tag + tags: + - Ore + +- type: entity + name: adamantine ore + id: AdamantineOre + parent: OreBase + components: + - type: Stack + stackType: AdamantineOre + - type: Sprite + state: adamantine + +- type: entity + id: AdamantineOre1 + parent: AdamantineOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: ammonia + id: Ammonia + parent: OreBase + components: + - type: Stack + stackType: Ammonia + - type: Sprite + state: ammonia + +- type: entity + id: Ammonia1 + parent: Ammonia + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: bananium ore + id: BananiumOre + parent: OreBase + components: + - type: Stack + stackType: BananiumOre + - type: Sprite + state: bananium + +- type: entity + id: BananiumOre1 + parent: BananiumOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: raw diamond + id: DiamondRaw + parent: OreBase + components: + - type: Stack + stackType: DiamondOre + - type: Sprite + state: diamond + +- type: entity + id: DiamondRaw1 + parent: DiamondRaw + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: gold ore + id: GoldOre + parent: OreBase + components: + - type: Stack + stackType: GoldOre + - type: Sprite + state: gold + +- type: entity + id: GoldOre1 + parent: GoldOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: iron ore + id: IronOre + parent: OreBase + components: + - type: Stack + stackType: IronOre + - type: Sprite + state: iron + +- type: entity + id: IronOre1 + parent: IronOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: phoron ore + id: PhoronOre + parent: OreBase + components: + - type: Stack + stackType: PhoronOre + - type: Sprite + state: phoron + +- type: entity + id: PhoronOre1 + parent: PhoronOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: plasma ore + id: PlasmaOre + parent: OreBase + components: + - type: Stack + stackType: PlasmaOre + - type: Sprite + state: plasma + +- type: entity + id: PlasmaOre1 + parent: PlasmaOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: sand + id: Sand + parent: OreBase + components: + - type: Stack + stackType: Sand + - type: Sprite + state: sand + +- type: entity + id: Sand1 + parent: Sand + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: black sand + id: SandBlack + parent: OreBase + components: + - type: Stack + stackType: BlackSand + - type: Sprite + state: sand_black + +- type: entity + id: SandBlack1 + parent: SandBlack + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: silver ore + id: SilverOre + parent: OreBase + components: + - type: Stack + stackType: SilverOre + - type: Sprite + state: silver + +- type: entity + id: SilverOre1 + parent: SilverOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: slag + id: Slag + parent: OreBase + components: + - type: Stack + stackType: Slag + - type: Sprite + state: slag + +- type: entity + id: Slag1 + parent: Slag + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: titanium ore + id: TitaniumOre + parent: OreBase + components: + - type: Stack + stackType: TitaniumOre + - type: Sprite + state: titanium + +- type: entity + id: TitaniumOre1 + parent: TitaniumOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: uranium ore + id: UraniumOre + parent: OreBase + components: + - type: Stack + stackType: UraniumOre + - type: Sprite + state: uranium + +- type: entity + id: UraniumOre1 + parent: UraniumOre + suffix: 1 + components: + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml new file mode 100644 index 0000000000..0a863e9e87 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml @@ -0,0 +1,47 @@ +- type: entity + id: PartBase + abstract: true + parent: BaseItem + description: + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/parts.rsi + state: rods + - type: Item + sprite: Objects/Materials/parts.rsi + - type: ItemStatus + +- type: entity + name: metals rods + id: PartRodMetal + parent: PartBase + components: + - type: Stack + stackType: MetalRod + - type: Sprite + state: rods_5 +# - type: Item +# HeldPrefix: rods + - type: Construction + graph: metalRod + node: MetalRod + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - rods + - rods_2 + - rods_3 + - rods_4 + - rods_5 + +- type: entity + id: PartRodMetal1 + name: metal rod + parent: PartRodMetal + components: + - type: Sprite + state: rods + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml similarity index 98% rename from Resources/Prototypes/Entities/Objects/shards.yml rename to Resources/Prototypes/Entities/Objects/Materials/shards.yml index 948774211a..58eb23a8cd 100644 --- a/Resources/Prototypes/Entities/Objects/shards.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml @@ -49,7 +49,7 @@ - type: WelderRefinable refineResult: - GlassStack - - MetalStack + - SheetSteel - type: DamageOtherOnHit amount: 10 diff --git a/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml b/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml deleted file mode 100644 index 2f79d67d37..0000000000 --- a/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml +++ /dev/null @@ -1,262 +0,0 @@ -- type: entity - name: material stack - id: MaterialStack - abstract: true - parent: BaseItem - components: - - type: Stack - - type: Material - - type: ItemStatus - -- type: entity - name: steel sheet - id: MetalStack - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: steel - - type: Stack - stackType: Steel - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: metal - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: metal - - type: FloorTile - outputs: - - underplating - -- type: entity - id: SteelSheet1 - name: steel sheet - parent: MetalStack - suffix: 1 - components: - - type: Stack - stackType: Steel - count: 1 - -- type: entity - name: glass sheet - id: GlassStack - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: glass - - type: Stack - stackType: Glass - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: glass - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: glass - -- type: entity - id: GlassSheet1 - name: glass sheet - parent: GlassStack - suffix: 1 - components: - - type: Stack - stackType: Glass - count: 1 - -- type: entity - name: Reinforced Glass - parent: MaterialStack - id: rglass - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: rglass - - type: Stack - stackType: ReinforcedGlass - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: rglass - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: rglass - -- type: entity - name: Reinforced Glass sheet - id: RGlassSheet1 - parent: rglass - suffix: 1 - components: - - type: Stack - stackType: ReinforcedGlass - count: 1 - - -- type: entity - name: plasteel sheet - id: PlasteelStack - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: plasteel - - type: Stack - stackType: Plasteel - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: plasteel - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: plasteel - -- type: entity - id: PlasteelSheet1 - name: plasteel sheet - parent: PlasteelStack - suffix: 1 - components: - - type: Stack - stackType: Plasteel - count: 1 - -- type: entity - name: gold bar - id: GoldStack - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: gold - - type: Stack - stackType: Gold - - type: Sprite - sprite: Objects/Materials/materials.rsi - state: goldbar_30 - netsync: false - - type: Appearance - visuals: - - type: StackVisualizer - stackLayers: - - goldbar_10 - - goldbar_20 - - goldbar_30 - -- type: entity - id: GoldStack1 - name: gold bar 1 - parent: GoldStack - suffix: 1 - components: - - type: Sprite - sprite: Objects/Materials/materials.rsi - state: goldbar_10 - - type: Stack - stackType: GoldStack1 - count: 1 - -- type: entity - name: plasma ore - id: OrePlasma - parent: BaseItem - components: - - type: Sprite - sprite: Objects/Materials/materials.rsi - state: plasma_ore - -- type: entity - name: plasma sheet - id: PlasmaStack - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: plasma - - type: Stack - stackType: Plasma - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: plasma - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: plasma - -- type: entity - id: PlasmaStack1 - name: plasma sheet - parent: PlasmaStack - suffix: 1 - components: - - type: Stack - stackType: PlasmaStack1 - count: 1 - -- type: entity - name: wood plank - id: WoodPlank - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: wood - - type: Stack - stackType: Wood - - type: Sprite - sprite: Objects/Materials/materials.rsi - state: wood - - type: Item - sprite: Objects/Materials/materials.rsi - HeldPrefix: wood - -- type: entity - id: WoodPlank1 - name: wood plank - parent: WoodPlank - suffix: 1 - components: - - type: Stack - stackType: WoodPlank1 - count: 1 - -- type: entity - name: plastic sheet - id: PlasticSheet - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: plastic - - type: Stack - stackType: Plastic - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: plastic - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: plastic - -- type: entity - id: PlasticSheet1 - name: plastic sheet - parent: PlasticSheet - suffix: 1 - components: - - type: Stack - stackType: PlasticSheet1 - count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Misc/metal_rod.yml b/Resources/Prototypes/Entities/Objects/Misc/metal_rod.yml deleted file mode 100644 index 10b5c42426..0000000000 --- a/Resources/Prototypes/Entities/Objects/Misc/metal_rod.yml +++ /dev/null @@ -1,35 +0,0 @@ -- type: entity - name: Metal Rod - parent: BaseItem - id: MetalRod - suffix: full - components: - - type: Sprite - sprite: Objects/Materials/materials.rsi - state: rods - - type: Item - size: 24 - icon: - sprite: Objects/Materials/materials.rsi - state: rods - - type: Construction - graph: metalRod - node: MetalRod - - type: Stack - stackType: MetalRod - count: 50 - max: 50 - - type: FloorTile - outputs: - - lattice - - floor_reinforced - -- type: entity - parent: MetalRod - id: MetalRodStack1 - suffix: 1 - components: - - type: Stack - stackType: MetalRod - count: 1 - max: 50 diff --git a/Resources/Prototypes/Entities/Objects/Specific/medical.yml b/Resources/Prototypes/Entities/Objects/Specific/medical.yml index 400e66e546..dfeb50fb05 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/medical.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/medical.yml @@ -57,7 +57,6 @@ stackType: Gauze max: 5 count: 5 - stacktype: enum.StackType.Gauze #first aid kit entities. See catalog/fills/firstaidkits for contents - type: entity name: first aid kit diff --git a/Resources/Prototypes/Reagents/Materials/glass.yml b/Resources/Prototypes/Reagents/Materials/glass.yml new file mode 100644 index 0000000000..9a09fc1a73 --- /dev/null +++ b/Resources/Prototypes/Reagents/Materials/glass.yml @@ -0,0 +1,45 @@ +- type: material + id: GlassMaterialBase + density: 2500 + electricResistivity: 1.0e+13 + thermalConductivity: 0.9 + specificHeat: 840 + +- type: material + id: glass + name: glass + icon: Objects/Materials/Sheets/glass.rsi/glass.png + parent: GlassMaterialBase + +- type: material + id: rglass + name: reinforced glass + icon: Objects/Materials/Sheets/glass.rsi/rglass.png + density: 5000 + electricResistivity: 1.0e+13 + thermalConductivity: 0.9 + specificHeat: 5000 + +- type: material + id: pglass + name: plasma glass + icon: Objects/Materials/Sheets/glass.rsi/pglass.png + parent: GlassMaterialBase + +- type: material + id: rpglass + name: reinforced plasma glass + icon: Objects/Materials/Sheets/glass.rsi/prglass.png + parent: GlassMaterialBase + +- type: material + id: titaniumglass + name: titanium glass + icon: Objects/Materials/Sheets/glass.rsi/titaniumglass.png + parent: GlassMaterialBase + +- type: material + id: plastitaniumglass + name: plastitanium glass + icon: Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png + parent: GlassMaterialBase diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml new file mode 100644 index 0000000000..5bcc49178a --- /dev/null +++ b/Resources/Prototypes/Reagents/Materials/materials.yml @@ -0,0 +1,42 @@ +- type: material + id: MaterialBase + density: 5000 + electricResistivity: 6.9e-7 + thermalConductivity: 18 + specificHeat: 500 + +- type: material + id: plasma + name: plasma + icon: Objects/Materials/Sheets/other.rsi/plasma.png + density: 200 + electricResistivity: 2.1e-1 + thermalConductivity: 80 + specificHeat: 2000 + +- type: material + id: phoron + name: phoron + icon: Objects/Materials/Sheets/other.rsi/phoron.png + density: 200 + electricResistivity: 2.1e-1 + thermalConductivity: 80 + specificHeat: 2000 + +- type: material + id: plastic + name: plastic + icon: Objects/Materials/Sheets/other.rsi/plastic.png + density: 6500 + electricResistivity: 1.0e+13 + thermalConductivity: 1.5 + specificHeat: 600 + +- type: material + id: wood + name: wood + icon: Objects/Materials/materials.rsi/wood_plank.png + density: 6000 + electricResistivity: 1.0e+13 + thermalConductivity: 1.5 + specificHeat: 600 diff --git a/Resources/Prototypes/Reagents/Materials/metals.yml b/Resources/Prototypes/Reagents/Materials/metals.yml new file mode 100644 index 0000000000..e1bdfc3e99 --- /dev/null +++ b/Resources/Prototypes/Reagents/Materials/metals.yml @@ -0,0 +1,78 @@ +- type: material + id: MetalMaterialBase + density: 7700 + electricResistivity: 6.9e-7 + thermalConductivity: 18 + specificHeat: 500 + +- type: material + id: steel + name: steel + icon: Objects/Materials/Sheets/metal.rsi/steel.png + parent: MetalMaterialBase + +- type: material + id: adamantine + name: adamantine + icon: Objects/Materials/Ingots/adamantine.png + parent: MetalMaterialBase + +- type: material + id: copper + name: copper + icon: Objects/Materials/Ingots/copper.png + parent: MetalMaterialBase + +- type: material + id: gold + name: gold + icon: Objects/Materials/Ingots/gold.png + density: 10000 + electricResistivity: 8.0e-9 + thermalConductivity: 30 + specificHeat: 1000 + +- type: material + id: hydrogen + name: hydrogen + icon: Objects/Materials/Ingots/hydrogen.png + parent: MetalMaterialBase + +- type: material + id: iron + name: iron + icon: Objects/Materials/Ingots/iron.png + parent: MetalMaterialBase + +- type: material + id: silver + name: silver + icon: Objects/Materials/Ingots/silver.png + parent: MetalMaterialBase + +- type: material + id: plasteel + name: plasteel + icon: Objects/Materials/Sheets/metal.rsi/plasteel.png + density: 15400 # literally arbitrary values... + electricResistivity: 6.9e-7 + thermalConductivity: 18 + specificHeat: 200 + +- type: material + id: brass + name: brass + icon: Objects/Materials/Sheets/metal.rsi/brass.png + parent: MetalMaterialBase + +- type: material + id: titanium + name: titanium + icon: Objects/Materials/Sheets/metal.rsi/titanium.png + parent: MetalMaterialBase + +- type: material + id: plastitanium + name: plastitanium + icon: Objects/Materials/Sheets/metal.rsi/plastitanium.png + parent: MetalMaterialBase diff --git a/Resources/Prototypes/Reagents/materials.yml b/Resources/Prototypes/Reagents/materials.yml deleted file mode 100644 index 12b410d9fe..0000000000 --- a/Resources/Prototypes/Reagents/materials.yml +++ /dev/null @@ -1,74 +0,0 @@ -- type: material - id: steel - name: steel - color: gray - icon: Objects/Materials/sheets.rsi/metal.png - density: 7700 - electricResistivity: 6.9e-7 - thermalConductivity: 18 - specificHeat: 500 - -- type: material - id: glass - name: glass - color: '#e8f0ff33' - icon: Objects/Materials/sheets.rsi/glass.png - density: 2500 - electricResistivity: 1.0e+13 - thermalConductivity: 0.9 - specificHeat: 840 - -- type: material - id: rglass - name: Reinforced glass - color: '#49c9a7' - icon: Objects/Materials/sheets.rsi/rglass.png - density: 5000 - electricResistivity: 1.0e+13 - thermalConductivity: 0.9 - specificHeat: 5000 - -- type: material - id: gold - name: gold - icon: Objects/Materials/materials.rsi/goldbar_10.png - density: 10000 - electricResistivity: 8.0e-9 - thermalConductivity: 30 - specificHeat: 1000 - -- type: material - id: plasma - name: plasma - icon: Objects/Materials/sheets.rsi/plasma.png - density: 200 - electricResistivity: 2.1e-1 - thermalConductivity: 80 - specificHeat: 2000 - -- type: material - id: plasteel - name: plasteel - icon: Objects/Materials/sheet_plasteel.png - density: 15400 # literally arbitrary values... - electricResistivity: 6.9e-7 - thermalConductivity: 18 - specificHeat: 200 - -- type: material - id: wood - name: wood - icon: Objects/Materials/wood_plank.png - density: 6000 - electricResistivity: 1.0e+13 - thermalConductivity: 1.5 - specificHeat: 600 - -- type: material - id: plastic - name: plastic - icon: Objects/Materials/sheets.rsi/plastic.png - density: 6500 - electricResistivity: 1.0e+13 - thermalConductivity: 1.5 - specificHeat: 600 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/catwalk.yml b/Resources/Prototypes/Recipes/Construction/Graphs/catwalk.yml index a43bb1d729..4993ac017e 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/catwalk.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/catwalk.yml @@ -18,7 +18,7 @@ - to: start completed: - !type:SpawnPrototype - prototype: MetalRodStack1 + prototype: PartRodMetal1 amount: 2 - !type:DeleteEntity {} steps: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml b/Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml index 8b732b8e44..21905f1309 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml @@ -13,4 +13,4 @@ amount: 1 - node: MetalRod - entity: MetalRod + entity: PartRodMetal diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml index 5e099a4fc0..93499d9fcb 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml @@ -22,7 +22,7 @@ - to: start completed: - !type:SpawnPrototype - prototype: MetalRod + prototype: PartRodMetal amount: 2 - !type:DeleteEntity {} steps: diff --git a/Resources/Prototypes/Recipes/Construction/materials.yml b/Resources/Prototypes/Recipes/Construction/materials.yml index 408466aadf..11c50dc669 100644 --- a/Resources/Prototypes/Recipes/Construction/materials.yml +++ b/Resources/Prototypes/Recipes/Construction/materials.yml @@ -6,5 +6,5 @@ targetNode: MetalRod category: Materials description: A sturdy metal rod that can be used for various purposes. - icon: Objects/Materials/materials.rsi/rods.png + icon: Objects/Materials/parts.rsi/rods.png objectType: Item diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml new file mode 100644 index 0000000000..780cfeb3c6 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml @@ -0,0 +1,35 @@ +- type: stack + id: Glass + name: glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/glass.png + spawn: SheetGlass1 + +- type: stack + id: ReinforcedGlass + name: reinforced glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/rglass.png + spawn: SheetRGlass1 + +- type: stack + id: PlasmaGlass + name: plasma glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/pglass.png + spawn: SheetPGlass1 + +- type: stack + id: ReinforcedPlasmaGlass + name: reinforced plasma glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png + spawn: SheetRPGlass1 + +- type: stack + id: TitaniumGlass + name: titanium glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png + spawn: SheetTitaniumGlass1 + +- type: stack + id: PlastitaniumGlass + name: plastitanium glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png + spawn: SheetPlastitaniumGlass1 diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml new file mode 100644 index 0000000000..a4e21c0487 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml @@ -0,0 +1,30 @@ +- type: stack + id: Steel + name: steel + icon: /Textures/Objects/Materials/Sheets/metal.rsi/steel.png + spawn: SheetSteel1 + +- type: stack + id: Plasteel + name: plasteel + icon: /Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png + spawn: SheetPlasteel1 + +- type: stack + id: Titanium + name: titanium + icon: /Textures/Objects/Materials/Sheets/metal.rsi/titanium.png + spawn: SheetTitanium1 + +- type: stack + id: Plastitanium + name: plastitanium + icon: /Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png + spawn: SheetPlastitanium1 + +- type: stack + id: Brass + name: brass + icon: /Textures/Objects/Materials/Sheets/metal.rsi/brass.png + spawn: SheetBrass1 + diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml new file mode 100644 index 0000000000..9b638a0011 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml @@ -0,0 +1,29 @@ +- type: stack + id: Paper + name: paper + icon: /Textures/Objects/Materials/Sheets/other.rsi/paper.png + spawn: SheetPaper1 + +- type: stack + id: Phoron + name: phoron + icon: /Textures/Objects/Materials/Sheets/other.rsi/phoron.png + spawn: SheetPhoron1 + +- type: stack + id: Plasma + name: plasma + icon: /Textures/Objects/Materials/Sheets/other.rsi/plasma.png + spawn: SheetPlasma1 + +- type: stack + id: Plastic + name: plastic + icon: /Textures/Objects/Materials/Sheets/other.rsi/plastic.png + spawn: SheetPlastic1 + +- type: stack + id: Uranium + name: uranium + icon: /Textures/Objects/Materials/Sheets/other.rsi/uranium.png + spawn: SheetUranium1 diff --git a/Resources/Prototypes/Stacks/Materials/ingots.yml b/Resources/Prototypes/Stacks/Materials/ingots.yml new file mode 100644 index 0000000000..87d082e604 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/ingots.yml @@ -0,0 +1,35 @@ +- type: stack + id: Adamantine + name: adamantine + icon: "/Textures/Objects/Materials/ingots.rsi/adamantine.png" + spawn: IngotAdamantine1 + +- type: stack + id: Copper + name: copper + icon: "/Textures/Objects/Materials/ingots.rsi/copper.png" + spawn: IngotCopper1 + +- type: stack + id: Gold + name: gold + icon: "/Textures/Objects/Materials/ingots.rsi/gold.png" + spawn: IngotGold1 + +- type: stack + id: Hydrogen + name: hydrogen + icon: "/Textures/Objects/Materials/ingots.rsi/hydrogen.png" + spawn: IngotHydrogen1 + +- type: stack + id: Iron + name: iron + icon: "/Textures/Objects/Materials/ingots.rsi/iron.png" + spawn: IngotIron1 + +- type: stack + id: Silver + name: silver + icon: "/Textures/Objects/Materials/ingots.rsi/silver.png" + spawn: IngotSilver1 diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml new file mode 100644 index 0000000000..adbe69a432 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/materials.yml @@ -0,0 +1,53 @@ +- type: stack + id: Banananium + name: banananium + icon: /Textures/Objects/Materials/materials.rsi/banananium.png + spawn: MaterialBanananium1 + +- type: stack + id: Diamond + name: diamond + icon: /Textures/Objects/Materials/materials.rsi/diamond.png + spawn: MaterialDiamond1 + +- type: stack + id: WoodPlank + name: wood plank + icon: /Textures/Objects/Materials/materials.rsi/wood.png + spawn: MaterialWoodPlank1 + +- type: stack + id: Cloth + name: cloth + icon: /Textures/Objects/Materials/materials.rsi/cloth.png + spawn: MaterialCloth1 + +- type: stack + id: Cotton + name: cotton + icon: /Textures/Objects/Materials/materials.rsi/cotton.png + spawn: MaterialCotton1 + +- type: stack + id: Durathread + name: durathread + icon: /Textures/Objects/Materials/materials.rsi/durathread.png + spawn: MaterialDurathread1 + +- type: stack + id: RawDurathread + name: raw durathread + icon: /Textures/Objects/Materials/materials.rsi/durathreadraw.png + spawn: MaterialDurathreadRaw1 + +- type: stack + id: Hide + name: hide + icon: /Textures/Objects/Materials/materials.rsi/hide.png + spawn: MaterialHide1 + +- type: stack + id: Leather + name: leather + icon: /Textures/Objects/Materials/materials.rsi/leather.png + spawn: MaterialLeather1 diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml new file mode 100644 index 0000000000..6bbd4feeb7 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/ore.yml @@ -0,0 +1,83 @@ +- type: stack + id: AdamantineOre + name: adamantine ore + icon: /Textures/Objects/Materials/ore.rsi/adamantine.png + spawn: AdamantineOre1 + +- type: stack + id: Ammonia + name: ammonia + icon: /Textures/Objects/Materials/ore.rsi/ammonia.png + spawn: Ammonia1 + +- type: stack + id: BananiumOre + name: bananium ore + icon: /Textures/Objects/Materials/ore.rsi/bananium.png + spawn: BananiumOre1 + +- type: stack + id: DiamondOre + name: diamond ore + icon: /Textures/Objects/Materials/ore.rsi/diamond.png + spawn: DiamondOre1 + +- type: stack + id: GoldOre + name: gold ore + icon: /Textures/Objects/Materials/ore.rsi/gold.png + spawn: GoldOre1 + +- type: stack + id: IronOre + name: iron ore + icon: /Textures/Objects/Materials/ore.rsi/iron.png + spawn: IronOre1 + +- type: stack + id: PhoronOre + name: phoron ore + icon: /Textures/Objects/Materials/ore.rsi/phoron.png + spawn: PhoronOre1 + +- type: stack + id: PlasmaOre + name: plasma ore + icon: /Textures/Objects/Materials/ore.rsi/plasma.png + spawn: PlasmaOre1 + +- type: stack + id: Sand + name: sand + icon: /Textures/Objects/Materials/ore.rsi/sand.png + spawn: Sand1 + +- type: stack + id: BlackSand + name: black sand + icon: /Textures/Objects/Materials/ore.rsi/sand_black.png + spawn: SandBlack1 + +- type: stack + id: SilverOre + name: silver ore + icon: /Textures/Objects/Materials/ore.rsi/silver.png + spawn: SilverOre1 + +- type: stack + id: Slag + name: slag + icon: /Textures/Objects/Materials/ore.rsi/slag.png + spawn: Slag1 + +- type: stack + id: TitaniumOre + name: titanium ore + icon: /Textures/Objects/Materials/ore.rsi/titanium.png + spawn: TitaniumOre1 + +- type: stack + id: UraniumOre + name: uranium ore + icon: /Textures/Objects/Materials/ore.rsi/titanium.png + spawn: UraniumOre1 diff --git a/Resources/Prototypes/Stacks/Materials/parts.yml b/Resources/Prototypes/Stacks/Materials/parts.yml new file mode 100644 index 0000000000..f8aa08aa2c --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/parts.yml @@ -0,0 +1,5 @@ +- type: stack + id: MetalRod + name: rods + icon: /Textures/Objects/Materials/parts.rsi/rods.png + spawn: PartRodMetal1 diff --git a/Resources/Prototypes/Stacks/material_stacks.yml b/Resources/Prototypes/Stacks/material_stacks.yml deleted file mode 100644 index d24a8cbe07..0000000000 --- a/Resources/Prototypes/Stacks/material_stacks.yml +++ /dev/null @@ -1,61 +0,0 @@ -- type: stack - id: Steel - name: steel - icon: "/Textures/Objects/Materials/sheets.rsi/metal.png" - spawn: SteelSheet1 - -- type: stack - id: Glass - name: glass - icon: "/Textures/Objects/Materials/sheets.rsi/glass.png" - spawn: GlassSheet1 - -- type: stack - id: ReinforcedGlass - name: reinforced glass - -- type: stack - id: Plasteel - name: plasteel - icon: "/Textures/Objects/Materials/sheets.rsi/plasteel.png" - spawn: PlasteelSheet1 - -- type: stack - id: Wood - name: wood - -- type: stack - id: Plastic - name: plastic - -- type: stack - id: Gold - name: gold - -- type: stack - id: Plasma - name: plasma - icon: "/Textures/Objects/Materials/sheets.rsi/phoron.png" - spawn: PlasmaStack1 - -- type: stack - id: MetalRod - name: metal rod - icon: "/Textures/Objects/Materials/materials.rsi/rods.png" - spawn: MetalRodStack1 - -- type: stack - id: GoldStack1 - name: gold - -- type: stack - id: PlasmaStack1 - name: plasma - -- type: stack - id: WoodPlank1 - name: wood - -- type: stack - id: PlasticSheet1 - name: plastic diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 081d527a4d..538f6e920c 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -22,9 +22,18 @@ - type: Tag id: Hoe +- type: Tag + id: Ingot + +- type: Tag + id: Ore + - type: Tag id: PlantSampleTaker +- type: Tag + id: Sheet + - type: Tag id: Shovel diff --git a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-left.png rename to Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-right.png rename to Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..33b781b5de4670a35bb02c83f864f60a6a4655a8 GIT binary patch literal 1294 zcmV+p1@ZccP)T`o?azGyO5Mvn3Cg_FcH) zlrYfQZit2UqWol*_fezl_PNUgbWmf!N%uJYi(Zy&^>XVhf|&L>&sQhd14QE%YrOc( z+AELQ^yabr#5>BX1lpyi2yVvw_Tu$@)_nesF?J_?uM%Qrey~$!<{3Z#8l^$72LO%r zeJ+GZAG}v(zcjwt8Z2zKhDh;6FacS{R!Ksci1L8zgkS=CduyV%w`MJ`jF*dV`R@Vn zo&pOB#*tUOULF9W+R3sEIo(h1tuiRr!jkB0H@p<^ z0gMuJtCy1I1V~WjN>225mb~hA5&+{7@7Zi3-`gvXt&^QzF6B!iK{sBKOFa*R>G^Xm z%V|vzLV}kE-2Sl6emvSud*9{-D8mCe$d?V&ONN^B=ceox$q z5PBVM@3YGD!9>jgF}OBSU{t6HxB@zi6*U1@K!>rS5CK(PiH}l;XaeZGaGWHRp+gh_ z)G%#2#z6wLsrLTSIusfL*nnWa-M;sbot~anMgrPGn`qm0IO0O^N>D#4m%v3uvnBHd za8+JN8(*b47Z-1yq-_(hB@WFHDZUwMwy*`|Rj!(e=rS&3!c7faB zcmm*h1sX05#xMv)5CKCoZGnbMgP}ucH1H+>_jHsMR`&H*8K4Uk=s1*1kOMCQP~rEd zALZ3pYP`k$A?JH99|P2FHBRXQ-Jm0M^(7%V3Q!1CL~uHT)9&$+Lc`6&$uc13Rt2>+ zwQQOrTj zEjP(mhmbiS9R|3J)HA}y3FrV_D3c__{hfmPc>s+!^S7hwZC_|}(132Fm+L$r_+Mu9 zydB?s+);y;-)jC5`k{!6fEqPw)TmLTMvWT(B^YCW0jDoA3v2nE(I) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..ba89037a6775168c8ba9d7d9992e97419fa5621c GIT binary patch literal 1391 zcmV-#1(5oQP)fF@3y|Q!fS0e<(*Kcd-CO;_ca}lS z_(~Ov6KnyxeSq3GSEzIP0`2=|&HUmX?UMw?<*N+##5~*k;WJ9EJ|Lon^nQ}i`wtIK z%KpQo-v1pXK`;TmM^EshMwiFi>q^sNt9BZU^2z*gV=_-$(yV1aRDj?m;MzBK8e$08 zRm8*)km+uc%NHl&1`T@u6yFEHn*jE+$>odAeyexd(E{aRaQDP8!BCnn0rVT(J>mUc zF9M)cr+dn{oZin5GW)#x^PzN0m68CZ^xV?c&FBWmu=HwjJxpgjCN&2+gbbFFty zUr
0c2EQh7rz&o~t3>%)7~&S!!U61*(n&~Ml1%@_A_XP>MEY%I1+KlHB}crPnH z>ho3qU1|YoKTi}AU`*e#YLzmxfAG8U{jPhfPqWVkij}WoDPZ<-ybU3hCyTAX)!%y) zESh}=EWoE<2tcG%UcG)w>3(2=d$cn`EHKy&X3ahWR*-yI-LaTIc(A+}qsnKsbAS24 zlm{mP=4Jn_lJ7yM_vnd2e<^esuy+Xod#l-JgVF>jxIdcddY|%)1izAC-L@rDxThZ{`i>UObjm(CdgWidHB%xB?*`|1PQeF{Bh$Jp)i!)TwXCc zpdI8`50pLti>*8&G-=3Xr{|W8HbVKd-C9HNp0n*OK*AnvjZmA*E2-?fJopSENpo4i zjv|0;kukd7{c|QJzp$`SN{|qkv66Xu^YzDvVyz&mKtiJT z>+h6RFHk46*7kgRsq~=nOW?C=}6u>JUfEWJz)gLD3mWHBF zo+ZJ)f)&_-l~1H51{@P?-FTkLZHlvOUXrXgKyvicpFT&#NV(zx!Crt}Ac&Z?%F}Qj zU-y5!q}o@0shj{kx1@P2L4w*?Z0Xo~K`#PKEIvEqD(O|~^;6B^>h_f=d7R*o_~x?8 z-FslErfSsVeNkS(%)ZFku^=3`uM096!b8{yada{^m;h0MF;pypbq@g%t*seZBrA%j z4v8Xwix05wFzM0@fP|`|wONqaAZh+qmZ;JkUjl|Qz3gr_GD>5QbdIVTtzgLNY%(Nu z&y0{XS@gF6*iJGE5ZD5IHlQki^`Dd|%JL!r=_Xn1#MUsI!SZNos!HVS`Y6vc=`v{r zzH)@@0qHWpA1L^gpG*?`M-!o0V(-iluQ#%0$InmkJHP;PS$VYBlN4J(Wtkyrp>s*En8Z>Coph1HM4R!^H=zl6MB}r~dH&_4w002ovPDHLkV1jKSn`{68 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json similarity index 59% rename from Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/meta.json rename to Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json index a470e00944..8ed6b60c1f 100644 --- a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json @@ -8,18 +8,23 @@ }, "states": [ { - "name": "icon" - }, - { - "name": "equipped-HELMET", + "name": "bear-equipped-HELMET", "directions": 4 }, { - "name": "inhand-left", + "name": "bear-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "bear-inhand-right", + "directions": 4 + }, + { + "name": "corgi-equipped-HELMET", + "directions": 4 + }, + { + "name": "corgi2-equipped-HELMET", "directions": 4 } ] diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-left.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-left.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-right.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-right.png diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png new file mode 100644 index 0000000000000000000000000000000000000000..175208bb8da83f3980b15c0927faa07e8f2c1928 GIT binary patch literal 699 zcmV;s0!00ZP)gNx08%A>B-E$!Rv5~1O=)}1rD6Jwsqo};V^a+B$ODn zH!{+CC3|=0+xhdrR<`oLi~P&tdq=NkZjM$p)|>-^=*kfyh=7P9MLB!%_|c64+&g+b zn;sqz?nLBHT~Qt$1j~1#%JK16&R(vE7zA+t>6_W~a3444?sOj{H;M`Z1o`j?BJ$h! z;}f(Lj=y|eYY80!;BJ^XcORy56=8R$;#NQEib-AA9apF%(4FZ%W=5E=J-ZqLfX9`o zRD?-gsEV*N9;F4k+h5FEcI%4sro|)Ihu;7|MEX}m5QWKjL{)^U2)D;`Jc7Nw;KOOn zd9%oM=@=s7`T#oG0n)cBf~rt7=U-N*-+wj~g`ydVVe!Y_YXS7i)BoMjoQr@%r#!(j z6^A9*pdhs7oTVW<1!M-u6_l*Zxu)N{P6kf6LuywWi(oQ_8<$WDuSX{x87vlz8J~IN;Aj;QVLqq#H$AeLC__B|86zt*C)Vm z04)Vo>C%g?>VbQXo+((?gorMEH$V&o&<-G#cm&~K0v@uwXh3U$SzsP`Pk3Db(F~Q< z+qV&5&}#I$i3nQrgm5r(q^fTQK+7^-oB4twLX0c0fCv_5LdD5IY%5#Y%5Ty|K3nAxvM&Gt002ovPDHLkV1f%RL9GA) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png new file mode 100644 index 0000000000000000000000000000000000000000..508d44ee0a9c94877b44ac6583ab2d2925fa6088 GIT binary patch literal 964 zcmV;#13UbQP)@g1Y#Kvfjvc}{;Yfcq!o zwsf=ta8LOa5x#%)czAfQhnsU}e}|4Hubr+iFNElhTS`Yh%PI1lSHJwm=x7KnOlTVb z?QB5`6nDeSxpT0SC`ajZJ9IRo-wO=78NIHul?7D5MfhNJNQ@DWcCC;06x7ZU7U>W` z1-80@5QKgwP`O~{RA$VJ$W}Ly7b{HKh5%wd#hXir}oo z098d$nyaK10wtwE>n;d&Zh|I3Qf-v+?LymHgc1T81Qm$oY?+QmkrJfzZS7D66hUiw z25R}J>tShhf$hcy6bs6nh$ zH8p^^q7AiFEI`G2dN!T28GxXuXkFO~HS5uwGDdL0T@cX~y>Ma#i%vAh%wSU?(h$&~ zym6{S5v05oXK>~WHRIGYQns%cs-pn*xo*`q7kb|HQ%re6Npdma(p_r7%B3SvM4Zz zeD3u)mNzyeaBgjHpU3Dc61<@luQG9Pd^#Sy*XPx*zq9kv!D3WH+7*`W)0zfw`O^i^ zu83)xx(~6b=q_VevD6)o?Cr^Ink~}Ez!k^=dA|~>0U`T-IAJ7C=x{@G9gTVyN zvTf(i+;e=m({7O|X%nL_oTkm>&Yd~m`~99@g?IKpo4oDjg{wD5mJID|k;(}mh%P-M zf(VEx5|pQ3es=J$0l0AW>(Tz@A#R3y-lX#esa zmW^gtiePp z0PXf59~5`P%sD^UMGy?(-ko~|jT~u7j%0?rqah5}m7`sP#yP@54gpl){+;{9ppnCt zj-UWerz?~(Gmw%Ys%y)kZ2+oSNm*7* zV?siaW5U5LVdk70?1Bi6P!wH?(4pT8^ou~R2=qDu6>t$g*xw_igeO~H0#!v&w8;gT z7lMDt(JKN$h3z7c9O~eNI#DI3R|Lv<`cAhE07wXE5L6&l(^EO-_eBtet!{@9gie6> zLq(m8_s%CC{n{gzIZvg@XP@WnS`37MYL4u>tcbCutPDc2C_Ey9st`nQfxoQCDf!2Y zZh%e@H0WtPX)`K3|#lDV3FtzZHOnfClB+ z<0o&(p~`7wlcU?*G0U~W958U>^^Gg66~L1(K0P=b9}z;Jt}0Sp6U(wGK67V|B_k!L zPDU~(B}XL0)XWO08D{2%Y;6D;#Fc}?@lV9MCYBXdjG0OYbE8U$s&2lOQ6H}nL@NQzna~i%{WII+m(O2}L#GopXzYX#gNBG|bdl&tbk~^KaHf-4?hEGB zDbEYi+1eby97LNOu`D?`KH=5zgvqqzWHRIAWXkdJ3A3u^)nrD0XJ=d|Bh`s|wm}-c z3F68DH*SwCrG*^kP|mz*$MV|13eMS`opDOORDw4s#jBVY+_*jJpV{W+^B3%XJXlOl zkVm&u_jzgtc>3rFSX~j{UME{@aO2z2{xDC>89>f=YYDPBD-R$3$S>bqZyiWB29QDA z9=REoa>BcVr?m9OJSOE!;pdy5Z~TYlo&9I_H_ju6(lV>oJpcdz07*qoM6N<$f>yR7 A`2YX_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json new file mode 100644 index 0000000000..84cb316cef --- /dev/null +++ b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json @@ -0,0 +1,109 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "glass" + }, + { + "name": "glass_2" + }, + { + "name": "glass_3" + }, + { + "name": "glass-inhand-left", + "directions": 4 + }, + { + "name": "pglass" + }, + { + "name": "pglass_2" + }, + { + "name": "pglass_3" + }, + { + "name": "pglass-inhand-left", + "directions": 4 + }, + { + "name": "pglass-inhand-right", + "directions": 4 + }, + { + "name": "plastitaniumglass" + }, + { + "name": "plastitaniumglass_2" + }, + { + "name": "plastitaniumglass_3" + }, + { + "name": "plastitaniumglass-inhand-left", + "directions": 4 + }, + { + "name": "plastitaniumglass-inhand-right", + "directions": 4 + }, + { + "name": "rpglass" + }, + { + "name": "rpglass_2" + }, + { + "name": "rpglass_3" + }, + { + "name": "rpglass-inhand-left", + "directions": 4 + }, + { + "name": "rpglass-inhand-right", + "directions": 4 + }, + { + "name": "rglass" + }, + { + "name": "rglass_2" + }, + { + "name": "rglass_3" + }, + { + "name": "rglass-inhand-left", + "directions": 4 + }, + { + "name": "rglass-inhand-right", + "directions": 4 + }, + { + "name": "titaniumglass" + }, + { + "name": "titaniumglass_2" + }, + { + "name": "titaniumglass_3" + }, + { + "name": "titaniumglass-inhand-left", + "directions": 4 + }, + { + "name": "titaniumglass-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fb03eb65e2bbdbd0866641766fc2a5ae89ad4cf3 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=e>`0rLn`LHy|t0I*+8K6p|^-c zlcEtrb}GXZEm7wUKC43Xj2qM!I6G*$2dZ@4;8*JYzq(B7Q z(ck~-Y@41IE}i-6+Rt_6`(EFd=KsEb-j**t>6Ec1k(Lnjut9@iya%PaHS-9HzRT r_$T0VRzSw(_mA!mJH5{;GgyCPa?Y8#Ah^M?1!R<`tDnm{r-UW|-5YuS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4435e8cba208002b40cc79aee76c2f66503be536 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC3|4aSW-L^Y+$8-ev=V)`#9A z5>1Lm4B4p+Q?x{#Q)Y&&j7ekgcW7@2@oRh|?BxwC)xj3!}5pfMmI`101h zHSe#VFWR78eEr+8d+f>Y4==xYce!25jWglUhWo!+}oVk}dVw&oW1y_TXrhemFu* zv3`FkaXiq)Wz{Mn!HKUQ7u}otj(^uS^PQ<6-++LE>(VzoZzg>{*WmWo^x5Rc=NgXv zF21sS%Us6v&kSC-B@4{>7a%x`_z&LU-@EleU4#ERYi5R~d-_Xf^&kH)a}Z>dr>mdK II;Vst0AWChQUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plasmaglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/plasmaglass.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png new file mode 100644 index 0000000000000000000000000000000000000000..46756cff7a8912ddc675572ef6c31e97721e6807 GIT binary patch literal 934 zcmV;X16lluP)FHPH;dS@S#@*i8MeyJj4D$OnU8lAOk=}2xNS5@X6M{24H)%Gk))#_wfomI-($9@tPap-p)x7_7C>>^5D~z zKy(7w9_@_pjqYP}=hnj^qV<9bBH&&>n%sX}tN-dh7Vf zw@>dHMnIWZ0n`%IV3a^SHX;>|MqiK51JMb<+(G1o^E+>C;=Uw@N*ldb4(`P3&TKv- z&vUlf8F$Ii2_RA>o>h4A&C|P^Z@-I0=f;B^%>V}-C^j)Hrf1BV9~sjM%01`a=su4) zn+ZK_va!CbwPVMy%DDMKjwm>S=7RPhtSi}2(E&(b5;F+59uBcG$#E$LfK~!;4`Qiv`v-N@u6!xl3^+-%(0Z|CKq60;HLhq)MZ3H&9285x4 z3a;K(&7~Qb+LSnP;<3^5e$v=M#1R#=Cm@2AiJ|GQ71{&s3#yCQmZiK913?17qW)#6 zZD{>lni3Ht2omad^!!G9E&$2WuBjJGou|gqJcfEMq`eK`25-~8PqR)56m6rL*$kUG zapJfMRyty!ecGt2sUbnoT*JSFio~-SN3+uXHJG?D6g0@#dY)lz_FlC$0Z+aD7MI zd-)?@{qotF7m^DBXh1}-h#s+;_vrD&o+e=hUHNi)W&dCM8|2xf<4aiO>i_@%07*qo IM6N<$f}LK(!~g&Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png new file mode 100644 index 0000000000000000000000000000000000000000..a876266fdf527d4fb964bb8b0396f5f1539fe7c5 GIT binary patch literal 1089 zcmV-H1it%;P)RnP49Y?58$DWERNhF}s1L{A1hdK1Af;7J6((vnj?!V*ErQP5+;Y{KF~ zlvNNEHAs?~>7J_hJXBB5Y|^`#0ntkehN!uy|z720H7iS3O+yj_{P5`V0U|O`0hK`@Ccq9QIIh2?gqHG?<5EZN00d8=#!O1 zbPCwr-Wy)szK%_u^S1_wHVrC>fP3?7o`nE^eK$gT!VgCWD>+egy>tw#jW<8sXahg^ z=HV5?2q)htm zPILWpJ) z2ZDr5VJ7bc9AO=#5VTYvh&ZBx_Oc_Xay-HK*NFB&`-19x zev3Qnl>*kJ%nkr5A+JH1S-6nBwRv24m4%Z(3h1flT{i-i`HzAq5^|75968uR;IQzm z^Yt_9GdoRRES(MriuSdw<9V7bj*;Qb))NEi<;(2u-quA51cnX*f>7;iy5zJ`}5o9r;dAip6n=hF5VmNT-w2=^Wg58^-F^{SN2E0 z?DOT%pLSkIRu(W5kvx(-VU6#})3H9Y{2}Pd{}o=B|FrxAl3z+r9f;U900000NkvXX Hu0mjf8Bqr( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..117e244c566f7dc7b3a8685f6b3179aaac2751bb GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU<~(kaSW-L^Y)fwSF?cx>jQHm z%O>yeCXGp!ofVw?uNj+W=ftx43z%&7;#?|w>{s-Jefg@6@sE{D9`g$b!oc1HiM9*h zYc)Zx=D7UIzivtD3ZL#V zGhFJ;zr9Uc`QH4rBQcpttV^VQycrrwW6M*I{ytw<`JhEuVeiY|MoT+IC+z!C%UNyy z|HaSEeh0UQ1jJr9IJO`+dhR;^%Peb6*KBRyd`=yRbq_~!GE-JWNa jW41AztYlfl|BZW@+~t7ddh6!^Lz==fC%T_kO+YMd&jpt#hAwl6h`z+pBLQ*KcqvVcv89Co#S=cIHO^ z*ZMp?WXRW&pgUDC6#lnXvDMy{J%8T!~FZTid(ILOHUcj=77i>J3A_?|OnHaz+MkL7uuBP#bB=A^SFO_HAQ z`^@So3{c{JliQWK)Is=2JtDnm{r-UW| DMmWM3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png new file mode 100644 index 0000000000000000000000000000000000000000..604143baa94884f66e9060ae629a41634e6aa601 GIT binary patch literal 379 zcmV->0fhdEP)<@$z@)Pl|C^X|+BcWE9rz=d;yZ6G9^Z6Gw9Z6GxKAp;@d zYy+X;Yy+X;Yy%XyIjF%6gocw1NZFF%x=Iucz}N?tN9aI-1ISF>ulE7q`>EaT_L-~9 zdPvJ6zvz5HYJo@vs-{L+6h%*}GM1`DD2YTQ>a-LuES6p5Gur+TA_AfQ5AYdYu#DW+fP|slfTLuQ*2qd1 z$yhenGltN1(Ok(Aw&%Tjd3QAL8J_XK<3P8-dS~A!@4d0BjM;X*Hd(iGnR?c2wN)Wx ztyhV7smuoS27T;?jeF(hk|fD`gFe7UOdhlqxVU%^z;Y4bjV7u0SwfnvHdejH$>}kU zGfch9s)Sa6Rj)k+k0zPrRiTI-N(&wr$D8U;*zrOoKtkF8;9j{b7Xgkl%q5q?9B0UK z5h(Y9b`vJCTm-;_9YU0Tb-JGk!xci52*VYoSp~ol!kB;mfoWDZ_RY=$ta>d@X4Pv< z{aGeCz|@~nd;5kjU%gaZ)+Q`uK@!rAJaXTkb8fz7>d!V}vaq!Pi9B-Ctft6y*jYdx zx$n=n%Cob8eULv%z&^;IEFgzx9x|30f!D3_18xxLk;FJ^(=u;b2_ zWru|P=jHMdh9TkuNfo2*1+tqZyPs+fI6Qns6h(aV#zaw+nj@O6_WgQ4*lH-1XZoiP zALGeK1xcQ)-nsy-1>V>_NCrtex}8g9t4)&I4Lf(8wgM7zJUcl(PR#|%n8ymq7;iM$ ns6b%>Qbh88-`@z&_$T-cPLxZpZzVb200000NkvXXu0mjfP~sO) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png new file mode 100644 index 0000000000000000000000000000000000000000..fcfe607e0c8d5bd5c05a5066ada26c66a1569830 GIT binary patch literal 722 zcmV;@0xkWCP)6r9C2NL8vRiIhtAx+VC4a?F9xX!}D^Xb}A%;4^&S7}3^1%bNBAM9m>puyGHt z?%H_QhLlt0g3P|>nSHZ_R1h8!@j-4h~$)-@j7Eu*wn&=`CB<@>?MFBi+sYSpwvu|tMDuVA~_)hjQOys z3C5;{@9``FX>v*}Om-m86_D;?S>WWBWr8suQ55Coh{${j#CbsV;z^RPcdlz148uUU z3JVF4R-n`CqSNat8x3PVq0}P2KP3Q&u4yP~8p7485V=wSux_8cm1fyNskJHldgmog z10e*<lVlzela4l>kI|dRoT6Z_dwQQxl8(``rZad4P8> zUWIn6nGjJf8(X=Cp~vLM$FK4G;Xz6cC@k4iQI3 zuMmbIzIh{rVVIZ;((^!}*WKmhbwZgP?N(FysujuWm-Wn; zLKWcP)AH%rNn$Qg=4>j&bG+dgJ6n(zAzmNqlkMf;FUx(k%A}Svd;kCd07*qoM6N<$ Eg1}!=5dZ)H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/rglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/rglass-inhand-left.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-left.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/rglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/rglass-inhand-right.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-right.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/rglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/rglass.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png new file mode 100644 index 0000000000000000000000000000000000000000..fb988da214a57cd672f7fd8ee3b5192bfd30f3df GIT binary patch literal 1137 zcmV-%1djWOP)}V~ynrV$HBR1698L`#0RabqqT^p}PRIY60jEo9F^rIC49GuRn9 zG{ApC`P2Yzj=MAb^a#<2l}ytuC}pBQSRgquw;kCNxhQRK1Ojbx4z4u}Uc=Y_{C6my z8o+X9o{Twfi;x3(N=TU~xyGjnNAaBS67VUbvBFEjXQ9}|C%+Vcgn$O2yY?JbCL~0v zu1CC~?RrY6*ju!Wn@H0tbuJXGi1kElYHF(i&dc`|05k+tg)%3+7;c5}^hfZ*+DAOk zl&NMK6Lk`X0Zb$F*@|^hW~rZ8>z@FisLJ*dnvpYP14Wn(#1wH55msJPRgQ;9*Ef_r zv47Ce?zM!vx*C9}BEYoz0RVTS>KAyKX!aKPJkcI>$k|BMwd5(`u_7j?uJ@_i4*dJ8 zdq8yCUYq@2p;d*(fR&7tg5~X6pAIM)odbE!fHDsQQUZ$L?(E3I-IY*+qN3QG5CPng zSYZ-z-L7`8!=!>(VMNdhi4_tXs2a=+u3CsR1T-jLJ^Tk6A}T`OtguqpoEF>)J`d!S z7&jGpo|&?-*^JC}McS+>#kMe4@xa4(Uc2+)vy<&e`%#KrJ3Pu%`}e8)5ts~R;v}BC#rsr zX;>56L>u+w(GNcX&Nlp4EX9v|;^^-EWxv<)=(``e@zRULrXdX@ZP$_3E1JbVEllHB;`a09_e_?Lu84xbWYP_$%|NC`ng z2ypDoM|XAAImN|{tQCx{841Bn&SiCV>8bZUr%n}o9slQ$SAD$w*1L04!&MC$*MK1I z$}b{_fQUo9?Wb_NXsSNY(^Xg>b7GX*3@lB8V0(fp3C`1IPbam=<*;Xs$GL-im7q> zy<1GH6;?TZ`Q*3frGU7ak|SmX@s47K_Z}^f(?n6@^qoiZeIa%NU;x!f0}#J@%CA27!}%L`PtlyX z@!jkA5Rf!b>Yf-Qt_oP5pb89&6*$M={`^<&-#dprl-LR2>K1_hd@i zieJ3u`4G4kDmd5D|(M z5J9uzy$APx~BuNRb@uqq=t(l?4sBd=d`eEbZioJhlx!B%A7Y*gJ=)?NV4 zdz=$AMT#25l<}));3`a&(9O^s=}%@bjijz8myxVO+h@!N+E_Tb)-aR+U;Oh$W$g*z za85Q!XhzPEH|oEzLvqAYgQW>sJ4%ieb(EBF0!1Sw32M7{{%Q-HLx5@VV~vhuvABq@XDUQvkb*MoH#5+M1WF|s>W2wxsbG=1ttYm zdC`{_76^4s2sK^bpjMb2HMB=9KGgdw;Jn9q$LF8^1?MZ=HuE<$M(Af)o@kF}Sc-Hf zJ+fR=cP-O6;+lpk7DAX2+78M;4pZRMAASG9#pTC%@5wonaz^S7@g8v=&54pTIwf?< zES|5>oXByam`$3MGz_F+Ade%Z6kbw=y8$*3Z$7xV{DdiIrkEI3OQ2ASfv-^Un0VBA zn!Y7Vg=?D0sKC`oRU=gcb%U9053xNhxT?h2!^iXfsN?D1pHbD}yz(9!R}@voRiT)& z&`6GvG!EpHn6j~6kEBo&*Gp7w19ON1S0Q%UVJ@ImL$V6j9%H_xG{+QOSWxmr-5)UxOR6@~R_^lYm(PL1 z#{L72;+H9L)s9!S-r0E}IT&CA@pxX$Ff}OKmaTeaMcG{C07Urw i-5(zOVEH=!XYns{k?d2iz@>Qr0000+!hA`)(7dQ zFB~d+C^N}(eec@?leiu98o2as%wURP*!1M=%cd4K3o&dEa7F z+w3;U*gV7XoUv?aTsr1zJ5*?m?)+6!J=T`A>F=9yEx;o2e{?+%V#>u%3c zRnj;ubS=u_c|y-csZzJK4FXJ)R3!DQqMSGqi?4lo)Na(bAk5+Z_tlf-i?HpOl#1+di_mH|Ocz_`f`T3#x=;=KU$~zj0WidDpu1`z^{gnQgrF z<+-<+7#3+TG1S!T-=CH8_N1Z`94y-JSS(m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..dbf0e470f3e38ebafb6ec21b93ee601d217551bc GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@Z4^aSW-L^Y+&M+-3&})(_J? z(pqmT+2-xLmc7Ao2~R>QgIYnMDRT;gi01Xpti0Sa>{s#$^2B$PdhC1g*QzIXZ*_a& zL3RN_7+|!J|D084Q?JWbo@yumd6niZE&JGG{N}FFwR`I9YB+r__Wk^Hd1+Qx*x5gO z$__)e|@ahc|?efM>1IO;B57TR*Ao0aEq!RCs38=k{? z51nVc+oSJzdQXJIB$a}5cXi@iCa9bQ3CI6CXKDKRmG6cB&z^@LT0Hw*P3-mk_jb&` z=J#WN-|Mej3>Gqc3=QAcZ=ar!SzciGEHr0kX9pa}U96uexx@R6G4rge?#bRsb0sh2 z=qWs#$$0h|Q_?&%&YzcR60grRq?Otwc&;&KcG>buI?hDuwI3UQIxr>}JYD@<);T3K F0RXzEyC?tv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png new file mode 100644 index 0000000000000000000000000000000000000000..17d66b196af4e164aeb420fd15f7f38a411c90b3 GIT binary patch literal 830 zcmV-E1Ht@>P)2s<&h z*SkC0(^VXLy&**LtmH^=@Gp%+kxj8*Xun{}{6F#QnX4!{UV?fvHUZh>}+0 zfe3(#5Quzz^u;Hyjllli!Qn^u9^f5#aYO<6SExIPAPN$M$48I&=IF~_61@cW_YMv} z-g}5;XY11;@lB;WE2Ql}cW#8S(w!S|taKA2Z7Ih;T%t+%<>+y*652<=F)TZ8eLkX0 z4Qp$rZZ%q#D_C~Q)Q})-e>SY&bbZS&H|`pkdu2KlLRJRbfigEX-c97wLKrJ<9dV>s z>omKul5}6iUWZ-fTD;9HhW%x-Ncyx zk?WRR6!JyE-6<2JyQmg*t4*wb{T?(jL?VPyEkJDq9SY5EBn$-I(E1+Kv9O_N5-`?k zMEwegfXK>rk_2lV&rUuqg-Aunc8V3pPl&IRT+&l(qxf2x&9WT^h~ZgoJ86 zi4gCE+LU$zIn}e_wb(E%&-|;yX7Q|}Ol+AYq)jEC8D-|=b3>ji+wU6k!x}XZB%(?9 z>!(?5GRs_rdpv_dmS9@;`vPkenuif^Z)<=07*qo IM6N<$f-!)K761SM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png new file mode 100644 index 0000000000000000000000000000000000000000..59fc92332cf1ae9d30f3c16f3da15faeb43ce0fd GIT binary patch literal 1070 zcmV+}1kwA6P)NBLhvqB&|ATakyf-dwwdmtf^iL%yJNyGFH|==Pknq;z{uUQ)V|Q>`dZ?(d_O@ZI*q z6Dg7BZ3d2);NrWBlwCsy!tjfS>#l}IV#=5>$SL>gRDxQ<#*Wc(ckQ#`KS9g|@CX33 z5mHfx_aCfZd;JkkVL(t_f}X0RCCC>PFHm33_%uk1LYNXI$mjJ)F?|j4q<{ROD^CqzVfZw#X%GQK|8Ok& zXrDMJc-yQJ2oBfCz|Co*ClOr`<}zr$M!x z@HVI~&0KI^v2maaLN{_2mMf|%fzK6SK7gQTB~+`4loFbRXahX(t`EfaSw}edfn(FY zE84zexudH4EQ&c4b6rr)dcK#SiUH6!9EARp`a&cEWJPA~&>B)LXeHpBy$~hIXeIpi z)r6D;l3*jpT1R$_Fo;sjTf^pDLwOV|zkQChsMu&W73~^%InmX#bvC^G z`uXuUKeSW5ncTa&HN1Z9I$r*~RYVZS^cqok@Y6SZ`s0Vk4kV|3HM)0oYiQB+ePWhg o7WS9l=&bq)dg9^qrTu^H4@5001*B#!t^fc407*qoM6N<$f^#(hasU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png new file mode 100644 index 0000000000000000000000000000000000000000..672d8be1d911eb4e7226766384006bc8a619127a GIT binary patch literal 1256 zcmVP)i-l9U=zrNW6FN?W_MW0M`y~On&|Ht3-jQfhZt9`aJ?f z5Ct*e&b?c_fA5_$fmjRR+QE&NvJ1*G{ffF2>pXf+Y0kff>#b+;{*OR6Ker9G8)DU zhNK___TOx&3n!Z3(+_Vqm5O03VnzfcNq8TSAdwC?m18Y{Qzqttdq99Rf>hzt4{tRW zU%Ctd(FbBfGJp)-&Ru1cps!41q&iz?~NAkf+zvV;02i>8}g9Zb>XNf`@e1R zK2Gn|Mhw)bco)=e*pPTy4lP1@PKg@iy+nCbkt}c=*hsN0C7lObC`6oQ)dQ5{Y-6TA=XT;L^WU(9sh^!Th&rj_N_J)?dg`AiHbI^_J^@o=KR z^8O%4lpsB)cn{5mgf9Xc3sH1f+cDIHIuG<0kmkb{k27l{03&IU1U6P&oG3A**ebk( zC_b3a+z|y|22q3BIocXg9G2kSdg_0g0U0h<|F9x1L_pp%7R(U=YlUzljTI5d=M!>N zN!v=^H7qOEDmn&R^&F3@=|%tqMYE9i4YPsLSjHfSL;s-SK6rpHg1QLm%<<0Y?iZ{v zmJc1#LhAMDD*EJM*G=YC&G$aYF#?8y8V_mSC-rcNMQe-Z%1| zGS=eSH~QY!Bm-UZG6YP^tGJ}9IeLrx%#jWTt%b~8B}_%jJu z&%p2h@z&MP|Nc3e1)oDKS0;lF6>u>yP!~a+2i z1@I&YFHW~yFrUv!(GU!N9~z)RBq!|%NT7`^MTYK38?a{OjLzAN=t&UQFW#KA=UV!^ zLCSWhS@GGBcKt&qDlBWIOdUVzsSC%upg*qoydbF`%u4KR4E&ghr{pj}k`N9yHZ%)5 z62ye&LZXg(p1-ntH}4zX$Jx?wEfd_Fcs!OPsE-^ig3p}Ukr0K`9?{Mzjcnare6_OQ zXVAYffKw1p$g%sIbJ$p^(^ZptR7tx=X;$N^m;CNe>rehT&ipjGe(~ny@}W&ug3Rrh|+{} Sem_P40000xKKP z6n+})?GK+85&6i$j$!rA*7pqUiH!$h6_kaRX8EdR2L6j?oVM@SViqyEh7K5bp^%-s z>Dsc_>F%3LR#gdQ=XMz`lXx6fu}}Z*nexb4U(@7oH7XfZy#HM&Bj_Y?YujI&S)xu7 zbBgyGvMCv5T${N!oAvBx9tMfyf(!{gjfT&X)|zC`pIE$grD;Osw6|6FTV8LSw8lMO zE+EIj>vjB>u#1%-1(QJv7Ocx=$Ub=8_e8e)riRkb{l7$4>}Q$1%<|8r-mi$9&IZyiOf%0Yub9tc+r8DS@;xJi64QgEHif_64BX!4 zd|3aalI3}fypzT}MT=bKEzbn~ZZoW{Y`JXakS+Ic3-5(l?iO#u6?T`)Eqrn3-~N;L h|5QI0?1;M|et+fhRXlFdIly3M@O1TaS?83{1OPBIu>$}A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..65a1b37a277ff5a8dfbc89b0606d87f5ac441952 GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6^viaSW-L^Y)fwUbBG!>xKKP z6n+})?GK+8@zc$&Isc*cfy6x>2Vxy%v(yBZPL2J$y{Si{*4Jgz2L=~7VAygkvwr{o zHLU)r*P@mSIB_ZF@UQ>AmH%PZv+|WQi}Q?*^<2AkvD$vG(Tn_#_xyou31h40a%p;e z3G>n!8iKgIG#MOvKCTN}ZJItW_Ee0_flWHmllNrCt&X%~aX1$v;drD`k7HWr-&LF=WyF+>OWTHN(_r_KmqHh2I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png new file mode 100644 index 0000000000000000000000000000000000000000..c3e391285fc61946303b03befe0515e687661206 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ%bqTdAr*7pPIKfsWFX?={!z{J zh+dVT;Pgwzp7{!Q#lwS+cJBzhG;irTE!Qi5c#T;p~5Om&S{u!5>;QQD;TQ?ZsU zQ_PPayS;zHf!DtT4zV{JR5zTyWy|u-vvlr0o_kGary7R_nwTqe(tM*TJzc5 zjZsm7>ob_{f8u->v;Gx_Si*s3)`$-ZjA}8u2ijJ%-auj&Y;9n%s||d~lw%Q^(DMIn z@RR*2-AyKVeR)#= zKt%974@3mULI6N;68InQpXm2bkqi@@pCz?k)*UFT3Jw5Lk`8#%L=p>o+&#PXAM14N_crO@-Li^0#k60g-6(GyJtv+0n!_ zWR-=)V^3hV;gnA9{f_Q&;sp58e-<%a92^YvJWaz$8_=Z zq(q}bA~uhjrFYzG{Ms}0~bD$ z#0+n3pdLO3V?L5Nv+B`$0wtUf@(N!^n%coz8~7KVy~4*%Jz8(V67Ku%@YV*J;FK;c z#z2C?%maWOrf*tf3v(BBDeTSmR?Pss=ML7?3=GLN47CASl{fA+25cUe@I^f5n1)@i-kvHw+wkEPQ>?K?Dv-4)Blld)IhDh8zwYi0$zMGG zbL=#4K0yTd%PaJkV^MnZa+Rz72B$y%(DZ%l{$U@(fh~0``P&&3F84nuWmNekxaS@d rP+gq3!y@^EuRoWatYcYJ|4Mf5=eCz;CvQ^#hB$+#tDnm{r-UW|=t;6v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..54d21339540edbdfef7a061321451cfeb18e778a GIT binary patch literal 398 zcmV;90df9`P)-GrW1bk1gg&000000000W>1&dl?Q{ED44PtobPdX9LoMcMH8`IQm3{Q} zKI#RX1T*HvJU!>Lp*IOV-(;(0sqfF%^X2$$^xR#fH)6*;%?94*y$O(1Eqa_LS}n^i zV!WwoHqd5$kR)x3W8?F+B_OGq#1z99V5?h)$(ew0n*6(VO-4ggw+@rD1UBnKWBr8c zvgmP|G=2fj1Z<0A^~U$Rllm`D+V4&shIt#SWm(00jR)5a*YED9_;rp6L0#OT#|!`f z0000006>WDrDwq8+#9sT+%w?QxIJ!*v1h=ibpoXLdIo&1E&=I&dIn6b5^yg)1Ey9b s5OdFfOREIL+B4wOYTrE8o&f+(f523ORMTGR{Qv*}07*qoM6N<$f(Q1mY5)KL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png new file mode 100644 index 0000000000000000000000000000000000000000..aa63620f249d8276a5ab81b9a35ead2a8dae7e07 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJAD%9bAr*6y6C_v{Cp0iB8+I|7 z?)X1B`NuEmc+OepoqC>fo($pv0sj2@)Cu8F+fF}xY`^F4)Q4xM&;QSF|FikJAd756 z-jBn#;|-5YJoxhOd&wgyHze}nT|}3kU^F=WeNClnz}i)I=7(3S@9)?&Cxcz#_ni0{ zQy1I{_pfujVyl{CCTz&3z+O}Hd$vZYNioC51`YNF>L$Ca87x=xb}(mfy2&~ivkPeH zXS{2;Skw^VP!d~E^}m`ev^H-NX3P`7kYE*4peT( u+Kys!YFviX%T+V?`?X%kE|1fW|H~%#CCg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png new file mode 100644 index 0000000000000000000000000000000000000000..262094c05aef83265ef96f18159480d10cfa2413 GIT binary patch literal 451 zcmV;!0X+VRP)EK*Ok`1{8*03ZwmT#sGGbk|`Z zu-PBd1y9Hjg#h{BVIcn9&uTf}!FEgptH1XtDkSwsEPZ>m;Cc+RNdz7zl>-AbJCtug z?wrR7+O$J!K~`tvUATzi#006KZvpaw=5SI#etsT00QCNtkYhi5mhZHzB6xU-|&Udu|YSn=S zPmFByXv+@LXV|12d6o78l^x!gk!nJ`J!yLZsToNtvEu0JC=6j tgO^VU3`HNOs~Ccko{o{S9yJSO10)v61aZq%ktj~si4v~wzNbl;002@-^oT=^ z;I1BVm?v;AC?Y2BJkP498USEf7LzaMta_><=phGi00(dY6M*&C+Xdh}&u+~@*#$Ai z;oC_zO_Qm(WqYd2sO<3qA|hVU3`IYus~Ccko{o`NkD3L%0TK&%0^D*{q!c9B5r!-BTL=5eKg0=8^|G2&U>wJz zBq0$cbDrs&Dn3n9Nqqn~ED)bmU|m;peB&pQaO8003ZSc-oP) zAeN^cmmP=`df1@`0DSCFSrF@PJ4_vj6N-pxZQu9Vco6^q48x#Wx9@v4ZnofVRe%cc z-vHWw-34IVHuvI503vFb**th|0|*fD@bI!jwFy1#xSRz<)STUryRK6exSF1-VHB(g zAR>Z!o>c$<(6((dW?8xmO(<1_S?!i*^n0{FHcxLgwwAKIs002ovPDHLkV1i1e Bdk_Es literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..58d6b1978a2cdeee64eca80fd9ab860a7a14628f GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^Mb{aSW-L^Y+$Rzh(!Kwug&9 zx^ejO#g-jhD`B$L{Q8o;DpsDo(~b0aJhT@1*w5Lk4hQ?4FLg<5HY#a zhaNxOcqM99sPFD@Q7!KN(!CpZ-TQL9@3-@vce8GuE!jHj_%i$VJM49YPBiaYuzqj+ zo0l>=TO7l(IX9^vc$0ka>Z!9nm-no?CX&gJ%>8Za=`3AGsfL@^pY3)N**Z;uH(|}s zE9K#mPe9UVm)q@IrBGkAT<6=}_wT;yp4oRUV(k@HzVqvD_AAWiyC0R|Y;V3M%&xj?PANm|=IM%OCYCZB zwzlI*>|3*+ae48J_Z1nJ-9ARLUofrl<%m3gd+Kk&hWb~s0V`L2OClQY26DRK|~LO>&;hr({$&2RXfX6|vxk>7V<0UgG^q$6V*J08IgbNzXQ4 z;a%T8-_>B+&%;(*;?`funf3eO-EZ#k_s_mKQ2sjI?j8T#h-aCZ5m9Qg-`o8rotqx^ zc4ckcCGn4G=k76XckDjD#GU=>q1iWM9P$F9mZhiESo)_GGwyWUzVyl&u;_)KLI2Mm zfGC*qyg~i*kza>?z25O}+q0QcPl~S3lZ3d0p+V~J^m7jJAMYl_KRM^%xlw+C@J8c+ zPak9zj=trYvO`Q@r*T4|u0z*NNsU5Xg{<@iN47Scn9JDxdT-^Ga|{fZmdKI;Vst0M87Qwg3PC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png new file mode 100644 index 0000000000000000000000000000000000000000..3471bfae2350b561e848ab9b97f45ee9d4262d44 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ!=5gVAr*7pPV?nDAg;~^pf!xB_pUh&JMW^>!4QafI%erbX#;hXUP xz~_&@RV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4f49bf95a5435eedc0510101b10aa6d15739459b GIT binary patch literal 326 zcmV-M0lEH(P)Q!fAit%J3;8Q(Ci8w~20Fl~ zQ9qW)1O>h*O_Jw@?9JaB5cr}z9(E>tY_|Je6H_M9>2hv87fS&Eh(b}HrI|z&3Z$8& zOi~qCuUGYZ9ABx#O?6d*s(=a~(2largq8uoemf?*25iE$3{(&kxJ(9Cz!jV}(1h56 z(*|6@X#=j{S_af~fNVitNUyrfZNdSAeL!tTrTJn8nY^KGF0fhdEP)Alk6~o73xfYw~aW{8|z4yABDFDE9qF&c7sm64oa7ne; zC=f^>N#?KL$K$EgV53kHYyvjCLLCKXLSz7Ft`4yQTXr3iYRtdMmqgHjnyD{foprDV zOuVk@tfR{raEEbLSV002ovPDHLkV1ik7qqqP7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-left.png rename to Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel-inhand-left.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-right.png rename to Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel-inhand-right.png diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png new file mode 100644 index 0000000000000000000000000000000000000000..223a7a9ef40e2e32ffd600adf43c3c31e63a0b64 GIT binary patch literal 626 zcmV-&0*(ENP)S!;3`UO)+%BSe8|Wgs|8XasbRTWNKW}j1Hlrj`GHWa$P~hT&F`olZ`|Bpx7QDZ| zr-+c5s461+Cu{8PWF}_D>2$)~F*80sKCbQ!P_H@v_xehy6%`?uV_-pLCXq=-5bk&; zV+_U^`T6;I72+a5t(8(MBEq(9h$=-D6#-RPjx(`&^6Y*8u9RB>a2dee59e#swr!NN ztMCXilhHe4{{Hj*jjG-c&{{))qDrlm?d65m+72_XBqA`g!=bsOr937AB7&;!CvT0H zZDVTI$PQBq zbpq*1LRBJjPtMs^-rQmrGety@mGvU12s&TIdWteZMRjj;-AdBCBCrxm_*JYmRuSTt z^nhVHz7^nV1b`z7ON`c>ilA#eov;2@y9kiEyGtN4@l41(=Fg*o2xTVcxnw^E;LK@e zl4m{aS^$t!l$f>Q7Q2`OX0~rSHx74Vs-v-=JZ3F0cOn9x(tN931c>R_%K%mQx+?25@(LZg%Q@hstDYZP$neuvb5N?~E}pGsYPA1Dw})5g{U|y>lvsGK*7Y z;${ppM(@}dM}2r0z|ZW)uN#M`>OFO9zfuF%vK& z81vuJEq3*>zP-I=L>x|mqu4B%%p@X+h$CuWUthPY(bJyxv_EbC0dN3_ad>kYb^rhX M07*qoM6N<$f{7p)?EnA( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png new file mode 100644 index 0000000000000000000000000000000000000000..f4c4259ec4a02406e31a75e70bf37f10b7338fc1 GIT binary patch literal 736 zcmV<60w4W}P)42M70pCHa0NBaUC5og~2hJ;4Vh4&beD%*32D@yN*H1uk;hs9DU5v1Cm{d3s` z-}Y_)vB{+mo}QjuL~wUfN{Fmm#=ENG?)2W7=NVO{_s+}9%f;UYD3_f7_2UP*6p{!& z90LQ&-7$CE3{yqjX|2&(^Viqcix7tZr4({0hzQd(At{klB8fmsFdVznBXVDsbzjb( zNx(6Hs&39pDf~R0_^ceax3@ezJoqI!4gqSd2#{0a=jp_skmC?QL`W%-bN*v;d=8+L zf5?$@rcM)iCxx2f?zCm0#oyn5{UW7w9l#(Lkuy0;DNHvv)LK`Vki^XBy>AY?DkK%B&>BK zDXlBM8-aW|0~j}^(*cO-7kL*)7*J1bf_ioXY_SdnIfl-KNhM8?e{PyDJum@)>vb~_VbdN(B?Sg>XB@EnS? z;jjJACPxomUS3>8aCcHlh^$M;Tvc&*dhg8hjH=Rm=k4w7aL+v}N6!EG_KjQ$NdzB` zfdR_hF?ZYyQ$^irttrE=Wg-}ChJHGooX zF2^o_fm}pxF2^AQ5;Wghj$HsLr4`6;IqI&0$w1<$N6j?!I0*mZR3n-83=PN-Bkv5@|)sGS47_snS{_ z1>oxeM5e=k$BBVGKgCSu(#*)%HV%-SjA_i0yjbu8MBi4?262Zm>;ZR~e zSi6{k^ZtG$M~cXN^BIhcc{m@}Bl{(Q&v`zS!`xAKaNpiLX9W>*BH(tKq5 zhZ8uRP6F`!{Oo&j=vk35AiHl3X*?gpgTbo+3_FrzUKWUmr&`wTS?H~8{ozXhU|$YZU9&tge3V>M#Q^Oc?VZnM z!Bkm-u`dA__Ol$LH*BSOe3Y=B0F8ug@$ax_SN%i)JU%|UMNvBc92*RbL^LzZY^y0B hA0Joy`fGp0{sod!qN4!(L}UN}002ovPDHLkV1oMOU!?#5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a626b143a3683e2b35f3626776c9594483849c77 GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^MV_aSW-L^Y)fwSF?f0v5)4? z`HMO_o=?2vf5AvxGqxn$OVHMJW@(!7#?)D59?vv|fBk>E<%5Tv^ri}b7N9X8pfvMX z#AS)!pJQ`$=Z3C5Vsh+TZu;+Sv&HXipKJT(TlvBxSAOk@5#vl*9J}Gf=E{xFAA7bH z2Cd%OQhqkcb)IKrxYDA{m20EUuV8x+T`(~{YwNTHQVl2mKD+B?lBMft%5eW#^7(aX z6F~B}Yu?-s*FJH7#a*V`{cmS?RIFe1{(eXnBg7pH4cC`g_D_(xEKz;q?c29^8fI&9 za5~o7CHStZ{WiU_WeKyu&bEMSp&`tndu{irT{n_HmYFxNt!+XHLuzcLGsna)f)?`r zpT*^mX|58TU&65c`F-2=Hi0YK|L4oamM{Fwae(_bQ{~gctj8VCt^!%<>FVdQ&MBb@ E0JR>V82|tP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d6fa6b611bbe5362de66fd4db93703894b7781d5 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;CmaSW-L^Y+$3ufq-^tq&Lf zP}5!7aX$D{UE`9H<#sJQ3c|evYr8IdEm^Eo`0SM~=b5ShZ>y?KKO9*iR;&s%2LvWu z$(dzRC%3=*!J;!~mwDFSUb^q?K07;J=c>x8b^BW0&-}gZx9R6z)10j_FHCqmC-wbq zj=O(vxwn;Y{?&hvnN$v0JzrU*V|BnxkW8cnXgt&)c#l`xYk~=(} z%w_D}DL+BDF#SN%J-&X|yOJAraCPi44tS*H(6!Szp-@zyH2uIMErn0#96Dd$+f#C< d@IPNmDH}KA2}!}8)&D@IdAjhipr~-|C3{QXKO7{<`cC1=g+TXVPYK4LP){=`wtk-Ub)9`=gvJ0IeR-x z1_lNO1_>c#8`gt&~c*8 zBgp~Owwxpf(86+}9bl}ZM6%`Bat&DyP*hYP*>ZHf6gdDL5NkOs%Bbo9Vl7uuQ6jo9 zBH96@SS~FkPOP!SJAhQnU%dNDR7ps%E`R}2EPwj!C9%emmIjEmoY*W#k^^XAInfTl zRk2WNIRgWc?SVUY?lD}wbO}XVTTc(gVsv?80Z~n+u&89Rnq;e%&856aHVQ_;D4;a} Y0RG45d9(fFi~s-t07*qoM6N<$f=E4tX8-^I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png new file mode 100644 index 0000000000000000000000000000000000000000..1c18406f688b9869c7bc59a262059546dd08e080 GIT binary patch literal 407 zcmV;I0cie-P)TsBLz|c-zJ2fawc?$%VH^3m6BIqD^h}eq01sGIKrgfR51}2!e6IDUb zgEqOl>~7Pk$v2ak{JZ^q+0EV^P^;FF(>-U%wlb3mmVrZ* zqrov?lM9}t3c#=Vy$ooG1U_FBGsZG-Ip~VvZ|@(@*rf(Kor?mbDmcl2Nmao`26Q<% za8uW?4J4^DmV^4`daT%hsh_EETL-ZWXb2bH>vf%zk?1Gnz|YTG&RApv+Yl~1NtJab zB&`McnT!Mf{Q7prF3mt3uMmb&Vd6f>0P!D~O?_`;#JaFZ z;DBI1U@Av{INSkKc1l|8UF*&5ooI)wGgzxuUO(zK9@clf8hHQ!002ovPDHLkV1n3g Bx0(O| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png new file mode 100644 index 0000000000000000000000000000000000000000..6d8116a9a4fabba57ee103791e5c897de5e7e6ae GIT binary patch literal 457 zcmV;)0XF`LP)3_2b8|CWHZvOB2nL0Le=#w;e=vg}n;1dtM_>^+$o{})rZ5e-rdIsyMh$ zp8eOzz&S6%;q|&pzDuM5Awu|mK(6&B@awA!3PUf&lkvy_kOI5x z4JY~g^xI-rZg77keK zh^RPjo6Q`Uvr_^}K1?Xx-9K1;uw*lM)W6af&_Z0e!BFrf00000NkvXXu0mjfRp8N> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json new file mode 100644 index 0000000000..7b17efcd45 --- /dev/null +++ b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json @@ -0,0 +1,84 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "phoron" + }, + { + "name": "phoron-inhand-left", + "directions": 4 + }, + { + "name": "phoron-inhand-right", + "directions": 4 + }, + { + "name": "paper" + }, + { + "name": "paper_2" + }, + { + "name": "paper_3" + }, + { + "name": "paper-inhand-left", + "directions": 4 + }, + { + "name": "paper-inhand-right", + "directions": 4 + }, + { + "name": "plastic" + }, + { + "name": "plastic_2" + }, + { + "name": "plastic_3" + }, + { + "name": "plastic-inhand-left", + "directions": 4 + }, + { + "name": "plastic-inhand-right", + "directions": 4 + }, + { + "name": "plasma" + }, + { + "name": "plasma_2" + }, + { + "name": "plasma_3" + }, + { + "name": "plasma-inhand-left", + "directions": 4 + }, + { + "name": "plasma-inhand-right", + "directions": 4 + }, + { + "name": "uranium" + }, + { + "name": "uranium-inhand-left", + "directions": 4 + }, + { + "name": "uranium-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c213d91a21e2b6a6bc1c0a3e4b850684e14e7eb6 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}W}maSW-L^Y+$8-a`fgt%=Pu zlya@uPH>4VJi&8CWL|Td&jU$~1WqrN6%LCU+Z6lMxHyD3=Xi@8{%_hBvuBRqwAq^t zfu@1LgOh2UH*_Xmx4o}3ca>F;h|alXsSl5Sj}Def`8xfqP@&n>(}ns*fi{o8! zDr@n(g=GmM{b#?HXk6cyay2mjK=Hvqn|HopvVIL^2^s1MOC-%sn;#2(b5keqWY%E^ z<2CQLoe#gg{(tb)r<0i>Rx&WuH9xCvd62Q!JwUd%^z6+mKF_$7Pj9t()*igs`o7({ z0QtVMwJ%vLf3TU%Rbao*;OB5ySm2B5ijQ)NFDiFGt7duNf0wcJ$H7^%{xLoSnd#~3 K=d#Wzp$PzMj)F7* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..349787f81691bb5c721923e58dedb6215357b4b7 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;CmaSW-L^Y+$m-a`f=tq-}A zxT37sPH>4VJi&8CB#l>U#(^~sjNSoCj;unwCOn0i0Tmi$DGHN%|E)iHcw_04h`e>K zK+{0L!Nq6d%io`W?-r?<^7EeO+LNcxegFMJ{h|6y--#h~-yd}7TP<{#tw@if7Z<8P*H_~DFwV$mPZ ziQL>SDZOsM%!a}*Uc^7cgN!Qkp)`iZ)P$=9Kg_VasM32A0DUD*=pu2-Kcf# ziIIfAYr1yr74G&;wz1M(*KP6(w|I4lCeMGs>9H~C&0#K%w;%Gg6*7cq%HGp>AoG;A_R0OgQu&X%Q~loCICh( BM*aW* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_2.png new file mode 100644 index 0000000000000000000000000000000000000000..8110e86abb114aa87fbde244a3bf15bfbba11596 GIT binary patch literal 285 zcmV+&0pk9NP)5Jf+Zr?9p20J#JdxdNOZ&TtC~a{|0V3b{l|3p;15Y&-;3AmYF-2w1qk+hnu* z=5LV&M4}%npc0H$<(R_Od9pSMV6-Z&^TzZSj_=nCHrriq zoC7%D9xPZApjkLeV{STt*ZBIJU;|`nj4#Gfc0sTKfO*ET8UoNP44`gC#eEtDz-?T` zlLLqY;($0H4*Zt`i7jy4M{j3~IbfX+j8-4N*`f|u=Y#fNKBWVL_JPC}03tH4{l;k3 jdC%HhE6u$ji~dtjhmYEVr7>MP00000NkvXXu0mjf%NlV8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_3.png new file mode 100644 index 0000000000000000000000000000000000000000..ec4086249a687f9b723a7fb434852c17edd81f83 GIT binary patch literal 321 zcmV-H0lxl;P)B(|W4Cm<`h2uo0=NEazpnhZfI5Ro|l5Zh_|x|8L* zPw&}S07-vVMlA@=#w`t{8pxj30D`kossWuSorc%4hv3W!Voxn}qC|DR&h_hYM_wGX zbqC<~d^_Af_oMbDxEv{4vxNnE{;BcWOC}5CBA@T-on`?5VE)n$s!0{TWy$s(0A|fIpA|fIpmZd?=G>GXt4sY@>BcrN!5%#8VOd954 z#yrf{PACmxGOCz|8M#>Qb`h8~Z8GcpJ`LiwVCGpS&F&PTyJCzgGOBtdVE#5{_w;?< z8?$2OyII9QjrCnPE|#m$w(kNH@Q1F-n(tn|jjr^t$sM+`f6Zs%K7!SDbGJ=?^KtL2 zoox~?>JpQO3t(OY07kE;z2-c$7Esa<^BRwDPXORF`80@G)Fpsbp(pb*YxfZb2ezq` l*X4bLov}A}2}MN2lP|!(E04JwYtH}x002ovPDHLkV1o5d&3pg= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c24afc4eaae0c5bfe27133a064362aed54602498 GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9fS(aSW-L^Y)gZUyFkX+k^QL zlP-89`6qjLtl8Tse&JY=w)SC0oy-qR)9xHR6t!XDM)Qf6T8{k@dy{kH2uu3((ivy} ztKK%uPrqlt{E$~c2?CfF@Dxu=^t=AIU=dHTQRYpTsoyy_%sXLp=BA72>=jDg=U%gH zc-LO2vNl%8M|r;Rfkn4_4*IMJ6`HXnZH~ddny}y3OhJ;s5YO7`()s(ZJS5R5R$WZaK?&#U;e^a8xBT9}O zR%cMCu%ExYKTY@Nhq?r_y*HVE8&o9JvUecBo8!~ZKVmnuGcL%ve^=exJ$1(ADMvP0 z%w2!y$z-)vZCS4;p4~T9b&g~~+|07dv;%*x-|^fKcYZeCnxs8?Dd{PD!$BQA6${4Yz|d## MboFyt=akR{0A%vM0ssI2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plasma.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/plasma.png rename to Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png new file mode 100644 index 0000000000000000000000000000000000000000..d3061820082b53fa8391947b72c7563e8760e880 GIT binary patch literal 495 zcmV7xV6on5}8LCR1yf9T_sUn3(-~re&@&?^Wm$ZyjOt3NZ4H(&YfILDiA(l#+Si(}N z>cHR*uB{s<&JUzWs5y&$mB{Dw{ZRrm`tNGhec;Q@qfq07(ZNvuW6&46ky zb)Z>q0Kn>AuD=zHL*4u@$B;tk zUYPcAwlSnHs`_8V7-p5{EMo|tWtOAzx4^9Z^03w&u1qzA&wyE+f}yazPcJvi*R}^) zV@R8k2O$tZ!0479Y43&)3S2ZpKut89rVq6NqgrG1* l%~czK2~p-xw^5^u(ho9+A`j8)8!G?+002ovPDHLkV1nx;+YJB! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png new file mode 100644 index 0000000000000000000000000000000000000000..0b632b9c47d55dc45ef2cbdbe562bbdddfac2b99 GIT binary patch literal 503 zcmVZZoE2O12DrgN)hy0DgoDLY9K3EY4CW z9WtncD)Cvi{FAsT1>Yil*yv98eFrx1$LKVD;PcgkQ2Up!*V6MF6F`Y6%0yf=LH>5L z7635n4q>h~VG1WXAo^RulZ~!j=781!usVbQ>`ojdKrHtH0C*6=We(so*lH!fCZd)A zvD^y`u4NH@%2m}~oVh)P&524gAo^P&`dh(+ND_N7Fi*gPNbbE@-`ZtPYAr*d18TU` zfo8t}0P9=1{y0D_pZ3Op&oFs>0#Ks`YI4;y+sJvc(fi46QFIsU5N29n#%6U0H4!BS z0CzS>)p;>2BF`0|FzOCdc20JS6fsXWat;W&%bW~(-lZrCTVP_^8%sCT&3`k7RD_;| z*#KvYA$?Kxzm1_u-o~(vA%Hf9nHc7^=PWUV&vM&Q`;*M<{pt|v30I_AgwKF^k`Y72 z-hX(7E??Rn5Vk}8mIU6xV2ihWL7QDYrOZ8BY6f=_tsj`;VHh_B-j&J*A-91 zA&MZUR~#>?u%vrVebWT;?&o>FypJ&+b<`A^Bgn~3Byld{2ui}7=iLo_6O)K{F>se* zU>LY<;QZY`@*mh23Mt-VqRXF9+BMt2zCtfoGVlGd4{G9FwxM%w%6EAwjuKRTQv@Ld lv5^w2n``3f8}i^k`2b3kT()c@bJ_p^002ovPDHLkV1iZacenrm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png new file mode 100644 index 0000000000000000000000000000000000000000..841d843768fb1480de2521dc4cb55f31b0ebc6a8 GIT binary patch literal 307 zcmV-30nGl1P)-I`n0WMKJi}M;2H(QRIFfMEiyE>^vBjbn=O|5Q+6k=yFCIom9T;PlnuN|d zGG`87ihP|`MX09YguaLIxcsfeANgDMLs zV$OGU0XZ@*xtf40cm)&%Y!mD`0e2uf2ez5b{w0es>dyh^T$e5n$_|Q*D?)7&N~#tK zpzQG8AN!z0uCfiec2FqAS6dK5P`Rd}M+9)+gXP6-SOGdacz_{zv^f9(002ovPDHLk FV1fardv5>$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6f7a4d876911c68ad9cbcd17d76590f88f4124cc GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU|j0y;uumf=k2Zieun}iSU+6O z7GBb2Fr~%9G9z3_riVrT;E|K;4_GBC1?SF@so-|%5$0w|JMPC58YHyC;q~*h1N9p# z6cy*)zqaiAlhdA7cli~RVBi4FXA+t}~Snm4Tj32bZbjAeN|eevuiGF!KpZ`k4g;Wf`<;oJz5o(pvuhgVkz zy}s(wZuL>`P?&gvCbtkLS2!!swL4PH!9ojyxOR5SG}SfS=z4hncc*bre1HBVAJ*n$ z3^z~fl<}7_GAur)5qJ!!SN@jA)8GrXy@eLX-c)Y8q{k$9asOAg`f1Bq{%N?_0^^Or M)78&qol`;+06MSLF#rGn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7e5910d747b6b5adf4065697330fcc9dc0aec161 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KVpaSW-L^Y+&MtV0eAY#+`m zT>D?RLBPs#%XY3Zjjr03reOI4;wN5om%M)RAiBdteY)6OYc{ThEM3hzo%&v@E&Xzi zO=QxizuOALe-!OJJ&9jI2?m%h)V_H2{(6$qmKhwmv*x?jpL}zJt-62j-?N8*E6!O} zTBX)A|M>4SUr+x!c;;AO?K;KnLjP_7m4C_F>GWx$jNz-yHPf^^IxhePi?sRE%=8*+ zCT8&8iZ~@(}F=5GhjT>C5N!@Q!&X-nsYUAYG>PyZ9l zxVudtR|zO&z{{7WH;e6&g4^R=jN9Kk<*6Qu>`1z4VQYLSlH>b1*PW4U3@Z8GloM(e zWi9XeVcOOuGG|%yEnnVOv9jiGIWv}StiI)FrrITbvp&%U3Ecc5Z^dlC^xy57$ImtR zuKH5>mgmNjsD?ddY&k*i@7sW=rTxtkQ&)4{+1DMkyrn?Qss7n7>5O;mf7I5`WmHl! b`oY9jzu@fbWm&<%XkqYl^>bP0l+XkKSiHz? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/uranium.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png similarity index 100% rename from Resources/Textures/Objects/Materials/materials.rsi/uranium.png rename to Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/researchicon.png b/Resources/Textures/Objects/Materials/Sheets/researchicon.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/researchicon.png rename to Resources/Textures/Objects/Materials/Sheets/researchicon.png diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-left.png b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..22a1a447ad6a3fd368410465d80b8411195c87a0 GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU{v>XaSW-L^Y)fu7E_?Wv5)B| zWLqL4E1Ksdbf@}n*f4=RA|f|^qS4%KI~^PZST1{VePpO&IvB!sNH6Es63NxA3PO+e z&5WJ$fBpT+!)I>4sy)XDG#h9~_?#t|O8Dz{ZnRr)_jLvD!K#L5%o>~aeA-?($!quZ z!qsQb<#4=WwzzlW{Ppd#{oK~B`r4&azWMsj^7ySClSAtAwL6^NpFQfS#s7C9kKA#! z?F&Ao`Dw1tnfUbGt|jsxBm9d%9hpA4gPWmqlF7+JT{i@eX_>PdgW%uUYn*@)zy+oKkmHS8>IMu=|uM( wSF_YQoL2t+4{}k_>!?H?{ji4|3=9d67{0odHRi5oj0btn)78&qol`;+0Q`BJLjV8( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d1565faddf8803895a5f0961e4a018c71ead7ec5 GIT binary patch literal 355 zcmV-p0i6DcP)*ARq4yOjtIHsJZ`A=<7t-^M~Z5~Io3W&z_g`TXdzsx^cr+}%Iw&F!#t zt*1>7=hImfr-@!(UCU@PHYxDGtrkmpdwr4lbQYPtG)@!!x*HBzD0Kn=000000000S zwh-{(D;UzkhZVE!7ClDuxp2NXOgzkbM=(#MkYrDiLQl-+QjoW`?Apbp* z4}u^Ff!O%Vu0CV4nR}Y09-GJ-ua^f+F~#8-{+gvnmo^Gs=7B~>RJqN zd)$p@Sq1zO?{`}Oj;FKDIP-vih>ZinI8u7Kv|K-Rm$-ZuR!eB~0(xLc0d)Vdt=KBy zJA`1ocu+uF+722b))-w3<46Jc-tyyojCc@X94Q?m2!bHE;sx`PS|z5kVM71_002ov JPDHLkV1m(zX(s>x literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/adamantine_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine_2.png new file mode 100644 index 0000000000000000000000000000000000000000..3619c2d794759b009d78633f094de5ed5b1fe821 GIT binary patch literal 361 zcmV-v0ha!WP)6H0bTyD7=;Yue-NX-&A>5`Q6#5Co$)TUap_2&N1wqiy(vQ)=b#0e(dM{^9 zddc-1g!@e)f9`qm-j4)QQc_YPW-^_b$#iChJaZ5W3~+RE48Uf!2H^ee*}MK;0xmck z<@Wsj?HyHBv01IX5{I$D03TnUz1JEf&;@>ad;nnn@;YR>{sMmimUuf*sM4HWTmxA6 zu2Jh{ZA&QG)q~Cp^47IpkY{6{X}LRvHt^}?xfS)5v2_ayRT_bzoAdU~Mt(5#D`RH| zw#Vp3FY6!o2soq@-V)~7m|8FFaV&6e0arpqu5J|2jJgf%ZcR`L3so9{Ls%K3e2PWH zm66C6gn)YsxFXvEAwQpB0g-^;lL!Itl|q%q-I|n?lz*LX*vOzkf}<-700000NkvXX Hu0mjf)i0kP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/adamantine_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine_3.png new file mode 100644 index 0000000000000000000000000000000000000000..6ad97e28b313cda9959f65140168b6d9d1380d65 GIT binary patch literal 450 zcmV;z0X_bSP)As=7>1ufY1ax$!A=gHiktKYWRPqv6a;@k>D0mB(ZQ({+zW+5yNQFppqoFy&BZ`m zb-7O8c`@;lOV2Iul-!YfpYQu#jzFziwLEGt9I3%@q+GrUd>I3rUtR#P+iU^&{CF)q z|6c&6aii7L>yP&jOePa{n{6S)nQvo&ub=PIXE^~JGk$q~0$}|1?s8mtfKwQYtn(QR zM=DMhv^zZjZEkCIvW|5KMYbH|ZkQFXmcKL`UF6*aIc9uybFD#(!k8IB81 zbY-n#V<;EK6o9l`4orx1KT6hd3P_BrWI_Yz%9H)(ZnLG?=n^Lj06hvH#v(nJFzPEY z6C;siL3Dc;0e-@m0RS=;%i1Zzn0pT#g0wrm%xC~FVblQg=`08%lnEfuhpjYCO`s~7 zNOfR7odo~_V(L_3wBCefE<^$W?qRfs&;|kNT)2kO`6{-7m@pz4fs3&-fC-X!Pk`H> sP-OstfNUpRjJ+s~`pO(lty)#|2eerS9?J(ZrvLx|07*qoM6N<$f?USETmS$7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/alpha.png b/Resources/Textures/Objects/Materials/ingots.rsi/alpha.png new file mode 100644 index 0000000000000000000000000000000000000000..b21f768cf0ac6216ac0e98487183611f80cf9ec0 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJwVp1HArY-_CmV7dQ4nDGuF%># zx3@R{i8JO_yg&abz^$(AN8qX{tKMra z-4&I+`}1_BsEyZt-4l0m;8@u9MX7IYl4fdb@wvmBJsACyT9njSzZ}snVV+a09;Y{D zziesG#1hVSKL&QC|9*{HYOH_SwlHpfw6Y&XAVoeTL-+iI*fe3o7BYU9dz5NN4H d8aG1$qr$8R+5Y&OAAk;L@O1TaS?83{1OS{!Tgw0d literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4f02918bb6ef06dd9e79b380f74bf2c3e17786f3 GIT binary patch literal 359 zcmV-t0hs=YP);8S|C}`B{@Kmajn#FvEL8WQj!L z@8PBb2qDgA&W%%y%=4@kc3pQa!d|w0ZZQDiqA1k+zV8f1q73*#h0C%$S7lkomSs^! z+P39a1|D|`=XtKi<2bzc3Nm051|h;h23*2dxH9C-z&MVgX&Utm@vBmA+jfQ!&|Bec z0H0t~Je%st(;5Cu+kG6mq;V1(DMuuVd>TjAzBz_NL>~~4v$rvWa$)?PMCH_F(H#5($l$Dj0 zQp>V@%}=vsk-{IQbzR&0<2dX(3`21LzW}&#(=^xfvMgy`R|^t?_@p$hs>-hCdA{CD z1>iG=G{!1`knukXW?-J@Z{PR!8s<-}-uL|qA@r03?+aADZ5y?1OTu0iiUuHIERe=Hi3|uI eO;(m#MDznlLI|&X33IOi0000C2X1od4>> uUu=H$!REutc5TT=wPhS#TwK1nJYiMWs1{_L87&D66b4UMKbLh*2~7Z<*oGMZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/copper-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/copper-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f3dfbbc3fa6a46e3f345796528251a27479e24db GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>@1PLn`LHy=BOE$bhHyVSq{> zlY653orcce8#WnD>$EmdFg$$finqX%RSFI(uN+*P{Pq8}Rns1ym>CDu4FnF4w`o4g zNLOs{pT6}qW69nFi@u)zx#H&e1xcaDewJO$e}zrTL3Up=)#rbO?sgRnf!o>LS}ocKh}HT17(iZwc$yGC|B{V0hAdrs4A$2d`>7g`30xJr@(j6?o=K14Jv@V}LRVfvnc$Qm)Mh3b!Nq(ir7h&WWF`$Fkx0Zd zmlIxeS%%zs@EJM`$NW6ck9*IF`NboowmiGz3ZF**rn#A54Ot~AzG6{HsO#;6F zbE-W+aBeP!Z-J*z?Pa$5;OhsuomhY)S78mDQd&f7&A3_uIqPyZS}>HQY1#z@m2xd$ zwE(RIgUVIu0jmY1gas^1)76A>*4Acp`4ww-gB7e6kRqi3rv+>lKI~i~ohcoodvu1J0y%Ys7MaQ@j{GCrx%olJANYNeUqqm*tE;8v z3BGt}mb|p^C(~iL+xu->?D_FbuU`egjmPoko*Mvotse`Lg1ELeM!gklsQ_9Us{qb0 zCM7d~<`gb6j~TE3z2}PMAozlRP6R;WU6728F%C2pMsW*x)qXX(#*n!+JAm9Ff~Fj< z#P|RZsv4isz5l+(_y7KqFk*pH4nzQ{YJN>y0Ln1V({g|acEGPXrP44u03<`g zP}LGhi!kmwKTN13qEXs{i7f4FCWD07*qoM6N<$f(#&#Gynhq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-left.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..90777614986322e658c20525a54131b33d006914 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Up-wMLn`LHy|wXTlY>Cp!>{t` zCw?ev9$NLLc?MTTL)a1)W+x>jLjwcFUpz80rp?hdGb`u!q~z!KcfT`c1{%P?(6D}= zm&oq+6<4NmNgjH|zQSs*ZNomVCF`c-EkD}!;d$(b;?2{`Hr!3TaYpaPv$X5U1@ZBQ z^KSgOD-!wPlyswkq%6)^+8+U>iWhnwziY zUv~CAtGvU$-~IZtkJtJ>{;pjo`IYNM8CTa~pRF!(iXFRx7S3FtY4eFAdVSg~rOVsj w-+yP2GwV@&TH5bFHui0gQ&$$SFfc?MkyViGH{KF=`2@&dPgg&ebxsLQ0Kip-Hvj+t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c00f30b21efd886ddd2163a5fa2d39772cca12dd GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k33x*Ln`LHy=BPPWFT^^uq5%d z+VjtH=jJqUf6*#pVRutAlaYy-VaMJa*v!ef_UX+3`EM@l+4rpU<@8jbb|9#DQM>Mn zsmkTwF|V{P^G1|5?mfTs*38_7w(cvTQI}f&-g)%U;@!HpKenZ1spLJ^$@YK!J@eF~ z$`?yzeSKq9uj<9D^^Nq{%Dp?&W!2m`eZ7ulI*0P5I;UDOLX2l%*mm~N^$3&y6C`IC z|F-=X+M%C*+Rk0!sE3OD;VCm4?>)a%;A!8cX~cY4ddtl67uRPtYHk-%Wk_sYx&Y`; awmXb=+Ec5|7qq?sndj;1=d#Wzp$Py%Np#`> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold.png new file mode 100644 index 0000000000000000000000000000000000000000..fca33d19006a62c711844cf571258c4ddda22b13 GIT binary patch literal 264 zcmV+j0r&oiP)fQs&BK&n%W00G6u`0MOJa0AO8QC(jQG7>hH$7=C1XwC5w5I-QJ|#}R8e zm;G85)@L~d{1k6a{d(EC9A_W!53zNC6ik`ndcL!{>M!E9y6YiKtcK9)2Fz3gIs~6@ z>?(E&cn`_=Em-UoFqRHMeqw{wMk$yAfWtO<`5q$nLJFo#3_%bC5sL>cuv3m8Vfe`a O00000fhdEP)4!IgGTFlkcr5W~X@_Up7SF*GTIg<&Oa$c7x`f#lY=nqxaZ z1CxA+qg=<|$-O5E5EK*?G@%Y+r4C}H`aCn63Jd_t+b;mX`M3Z8+~+6f`J)VQaFWh- zA$daevBUYeaGJQ82He6^(X3_eeO506o#2P}X8qjsInLj}Uw}!@42UdNFV8gq=s8)|J002ovPDHLkV1mT7pm+cP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png new file mode 100644 index 0000000000000000000000000000000000000000..f4c088b762d243b61245258cccca9f0cfde30fc5 GIT binary patch literal 438 zcmV;n0ZIOeP)nX(c&`?M zEwb-DF6X5+#GM=C$~+Y1HH~}kH7G!*@yl0vJ-!avu77|jj7e4oMC8l&w*mmvoDHqc z(xQftWa6N6fvP?vId*FgfTFwsoW}TRlb1jCfKfXF5&4qLkSH@U2*O-r>?z{`Fg614 zs#P2F)9 zcoK@pm%JN5vlA^CEhl4d2uZfF^o7xM6kA_Lrm@&yoaBQBWwhq) zj$8Ha`jPC-uP$$j5SFv4`0(IhGdn*f<6iu!>N$CJHgVhb)VA#BKCrz1!P+h>pKmj# zh7~Q54tU09@{42D^S7Cu4`t-{L@D0C^g`KWi<$Dv>3{!wo_Kj>>nVx2HKzoDURrYA b@;i&-rc|EGOs78qgN(t`)z4*}Q$iB}wosey literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f03610c17b59ad7ce30c3177ef4d29666c16af2f GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;OqaSW-L^Y+$3E=EV0;~y2( z16S*^FMaah!J;RkHZ#?4xEFk4%Dd;d(_)tf`_`LE;x3zY7hd#}DrX$Ed|T;oI)s*4vkiIgWi~eATjmCt>G| zr+&u|A2yvHm1M$mMrOhD>v^-Mt=uKxwEMQbd6ezjsNziX69P8-)w-5;-Ee#T<9_0j zOZ*dO_aB{W%EvF eGXL*C@C3h>Nr~3BsI@G zD{ul^E^hEwKdfi91&wHJNt z6}|YwgURt!g59AD4vMKFcFqeH7;wpJG(6+D=HO_OzKKoX!}SCfhLTuLzOY~M3PAH1 NJYD@<);T3K0RYtEGO7Ro literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen_2.png new file mode 100644 index 0000000000000000000000000000000000000000..8764c9af3037d3a948b55aaa53b2b96be63869fb GIT binary patch literal 372 zcmV-)0gL{LP)5xwCAL8j#1mNO0$xE+AOwqmm9mjphPZ$E zX~ca^FeLlFdGjP-Wo7mEYUl!pNG9{P{kP6DJ!EEAPncPPVZxi z<|^YPxn;Yj@TxLOONdja=^Y%Wo88Bj(-cI;{lS=n>dGigfKJT-P<%31Zw!W=kgkBn zm=`mp&y+FN0-#v@m;$b%4r5~gAP@-Rk0x4Ux*AqO*}p(qLe>KyQ1Q3ZOl3z;|8ASR8qU z_@FL`b*bcML~cypltKi zh+fqQ#?}B<)d*fz0qqTpXJ-^B-fTA5yzAe8q5fANCQiOD2n7>2WzO1Wo&IZE-9ZDM zSj7nT3^@n>$UQ6)P6phLwhdLsgS_;P{m81lw@F8+hQ&P;~D2^e^Hm4~sI-XMOak`0(IhGdsVW4Hia!$+z-fYwP>B zTikZ9h+&w%YY|`Y{?C_`FGROndN1x@P{&dy+cZUe&-b&nE&bONj2cSkE>+tdTg5Du m+LIUdltW2L>C*E#w;3H+(mmrvo<#!#g2B_(&t;ucLK6TWq<&BU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/iron-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/iron-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d26ff66d3b552d68fc3437bffe88881ab0a69b GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=KRsO>Ln`LHy>*ed$v~v_Vb+{x zMu|pEiN?wqO@cGp7&({)#4g-%>zvgk9-PDdfBFX|x7(MeiT5)C^)fIVhz$+BuAEX> zc6Z9j=av8dU#wUX>yXZ{a`o$5dJEK8(iwa&&)K!Edgt_86D8UlzwYd}c5u=-T{Lft z*~JSfUsFF_Ho0k8BYiIQW#a8^W-W^}lIDN+DSKzpSN7)Kz7VI1d%T9;sdK|P%zyFZ4V%FRJhCS!mUyc?Fp?&qmSNS;ZO5S)Rq4$kBMs9AS&gm<L*6ciM6c6QF3IdjE| z6+S*b({GwQ0m?F#1o;IsI6S+N2IRPSx;TbtOiWIYsA>pg=+$4M(QwM#EYRh#wf3Tq zy`mR?crZDhO0YY0!9g)q#Ljua0s}62jfQ6&*Bl&8(l@aQe7K&#!cY>+$rtu3UIAzx NgQu&X%Q~loCIFuNHj)4U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/iron_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/iron_2.png new file mode 100644 index 0000000000000000000000000000000000000000..ab6bd1789252e1041441f67b9c3a27818cea3d55 GIT binary patch literal 309 zcmV-50m}Y~P)8vR@etl1-o>MMKsT=3niE(i@MRD+ag2+?e2`XK@?J8ZmMj*FC1?7+ zU-`PTcQy;*!4J$RM&NQhL+1yI083Kvx&yacsK&yHDD}& z03Zd(VdnA&>iCs0N>QS{kTUIIgBBj3j@GF<_<}yaU6rjv1L>{ zpiM2W5rL+wGIGQ&g!dc(gq$48Sw;)6EX#vq@J+3O4B3sRA300000NkvXXu0mjf7PX>A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/meta.json b/Resources/Textures/Objects/Materials/ingots.rsi/meta.json new file mode 100644 index 0000000000..10997202ef --- /dev/null +++ b/Resources/Textures/Objects/Materials/ingots.rsi/meta.json @@ -0,0 +1,122 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "adamantine" + }, + { + "name": "adamantine_2" + }, + { + "name": "adamantine_3" + }, + { + "name": "adamantine-inhand-left", + "directions": 4 + }, + { + "name": "adamantine-inhand-right", + "directions": 4 + }, + { + "name": "alpha" + }, + { + "name": "alpha_2" + }, + { + "name": "alpha_3" + }, + { + "name": "copper" + }, + { + "name": "copper_2" + }, + { + "name": "copper_3" + }, + { + "name": "copper-inhand-left", + "directions": 4 + }, + { + "name": "copper-inhand-right", + "directions": 4 + }, + { + "name": "gold" + }, + { + "name": "gold_2" + }, + { + "name": "gold_3" + }, + { + "name": "gold-inhand-left", + "directions": 4 + }, + { + "name": "gold-inhand-right", + "directions": 4 + }, + { + "name": "hydrogen" + }, + { + "name": "hydrogen_2" + }, + { + "name": "hydrogen_3" + }, + { + "name": "hydrogen-inhand-left", + "directions": 4 + }, + { + "name": "hydrogen-inhand-right", + "directions": 4 + }, + { + "name": "iron" + }, + { + "name": "iron_2" + }, + { + "name": "iron_3" + }, + { + "name": "iron-inhand-left", + "directions": 4 + }, + { + "name": "iron-inhand-right", + "directions": 4 + }, + { + "name": "silver" + }, + { + "name": "silver_2" + }, + { + "name": "silver_3" + }, + { + "name": "silver-inhand-left", + "directions": 4 + }, + { + "name": "silver-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-left.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1d8f0b860d029edfcdcd22f3b86892153dbec44f GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Z#-QbLn`LHy|uCTumMkN;;#vU zHl6Jc<>s|i7jX0|IM{0I9|~dXdC=9ZdQ|+uf3^i2L94#F05t-^h3UJW-?hD?rL-xP zV=?;=<4qOX<>yl)Rg~Iz7yf35GY|6;44u2~+U@Uq_pbCW{BDzf`phiz=kIprM)&Pv zb)M(ovSjAdUF)Ws*9Tl(c};8S6uGs%>1j8UKkvW#HdYv71(3YoV{>SBWlQ~B{vTH5 zG5fC@=hrf=Eu2yQ^@Os?|NHZ0&u&@f^zYQ&;(6(Uf-AS4nrd@sakz2XwE2CTSG+38 l+3PN`_~wcN76t~1N1XD!t?oD3PIQ9I_H^}gS?83{1OR08d*1*6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..44cadf5ca584eab19861eec2f3e9dce744058e9e GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Up-wMLn`LHy|pp-uz^79!^!D^ z`VEH*`2C8i3pjcm8vcfcXR|Nk5Kw8G%dw4R*17*vwN_jX?C14o0cr+<`9RfdM@`qPwL-~r_@YBXZ-3waaB6RmI>dAah6CBs5A!~lyf-i|I30bC zea;`{0sJRX|9 uTdzH47yS3&-J^H^%h?i^IPx+uuzg@$tKP0!(wWr>vc=QY&t;ucLK6TW;(Fr% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver.png new file mode 100644 index 0000000000000000000000000000000000000000..bff6acfa4fd7446131dee5f2ed9a62d772760427 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ&7LlfAr*7pPEzDMtRUiWf6_|U z&IqTV&DLL|{>#a%$Xm9G$@a7eclNd^{uBROdOX-$$JLf7am*p9$MV<=({#PXM;Pu^ zGX!}tocUZ+@qcAQl#TD@^!t{_H|Z>y!l%4W`RH%XEep7QsMpRyO;80#D7SLrWA%UQ2nvRdIDlVPQyB&pEyVQanH koz{*gLdgsUk{>NS0`F03_}~%eCG;d?31QELlq7I;~SZ;@#!XUYbar(qO*vyaAx9 zs;cTjS!<)UHsb<29wG|cl%2;tDg`<39w1kNbS zz!v!H^9O+2_jz!Zfn)GTHduAo0TGFP-vcc0y{MgYPwRU<*u0>p_TFQRxdW#utbvDN z0M3tc;g@iq%MJMx`St0iQOI8hJEO^7AP+peEosi4yQj5|NmW ermCvyU+Wjg`Kt(b@kavy0000Zt~5Jf*ys)&*zk|mlP0Ev6h?malk+`|W=OJm7W3fF0!A{xi`jsX*=<5#Q~_P?3= zI|8_M>sCW)t-aRT*F4j;G6sNQ7ytmyIRL=p@i_ebKLNzX<2Z)%zVESZ8=P~85HBr_ z^A4O*6+p@O{p||?@bP)xxC-Fd__f-Yb(jGn^3yZ{Krr8HwK3-Dd@l#ZFSu%JEtFD; zaoh#Tc%Ekf=fWtCfQUSsS!=^N8^i#TaZMN#fVk?thmA3b0UKWlV*n^st&|F%c@$;i z`YfZtY273X2pT6-x6Vg{tD<7*y)q`fdo5XC)^R~@Tm7z4n%t{oA1 zHjhC7h#)P(m~>!W*ADmzWPam+g>iQi5|NL)0i>PC!+5kAr4XK4#XvfW+Rb=r6_-F_ z7#5G9#<&_F2FU@gya` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/banananium.png b/Resources/Textures/Objects/Materials/materials.rsi/bananium.png similarity index 100% rename from Resources/Textures/Objects/Materials/materials.rsi/banananium.png rename to Resources/Textures/Objects/Materials/materials.rsi/bananium.png diff --git a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/icon.png b/Resources/Textures/Objects/Materials/materials.rsi/bearpelt.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/icon.png rename to Resources/Textures/Objects/Materials/materials.rsi/bearpelt.png diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth.png new file mode 100644 index 0000000000000000000000000000000000000000..a6e953c7072316057ff0a0f4ac336a35602d6866 GIT binary patch literal 947 zcmV;k15EshP)A#8?z#8eJDtC!rLj;-4PZg5AvMI1$V%%Mph|+&xDzoENh;NiaUqd~(YSFZ z27@u_&V?%zZ5m?YMx#}%ZJBncwkawzohftgoqNx9Vd}zk+M>jb^L&8!`Q`VX_dtsl zE&lI_yE*LArMDdiq)~*YPQ7IQ^8o97^x?bpBr$q@{>hQEO+D&vNyk5auPCH+l~Vcp z`UhO49E1QbmEp=|l4c?PQGgHLf2*i0g^&^2wY$C642fN@cN>B8nPJPJGJp zQfb3gY}vrY3u8rqL-!BtZEr7-$>z~o|0R<`fDlM2NqHHRtr6l+k1;XE82S%A#PU*U z!}(1EoF6@tINBjL5=f}7{?4A>UOdkulg=S53n4%X3#Dvq+a*a7qNqU_`ot!}uh*&j zHNN`ti>428!vN<;&m>2WK0+pwMF=QY%G@Z;Gc)}I4?K7nAq7H!K%%vW5R%&3D%Hww z#BoFd#Bs#6@4q1k{5!jXmq$-8969nZb91vqQH-N)k_0m8G}UUAD2g#jf|VpF+orO5 zi?!M+K~QII_D76~u`Gpc+w}JBV`h4)nS0{^jYh*($|8y)9PM&@Z4KA+*uVb(KQERD z`~VZj)M~3V!jLcwn7%fJ9|WXajrQ8;=-5fmo_)A(ihQAiE0^Ed{uxRkSXud%TCGlZ zwm=+5WYTR&Wl{HiqPW4$m1U~cD&KwkHLk0XQjjm~psTA3AuaNSPK=3}`23S741DY4 z$XU7V1`?ArDwPUtZ7!wK0)vBt7?W^y@+!tOSh@Kbwo(|AptVDLx`UqGJy@1SI-O&7 zX3GC%u~;?;|M*kS^=;ZeP5yyb$6g2?J$B5QoS4M66^_Z>_5Y%zK z6vi0lum9vnapTsLC!X)V6Y+)(3=a>>@$qp3@cL`#>O(_MxQ^ox#Ree+N-4rHq+YN2 zi=~CK5cp3&^Wv5@Z#%%>dGn1|in)9iAp~(8lk!{uEK8I}o;`Q?--uhZXwhPwKLBJ; VP+vMi^lJbB002ovPDHLkV1j|z`(NXZ8u;MoTh$~n`g-oRft~Z_TmQ6l==j^CLQ2=N ztla9JKG(7wga9v<;n*O_d?Rjaz|XSO*)-LN{Qom2qaP|Jg))Q z^%y$wPGZ}3FqfS<2OQYHXB41!O?ZCQ#aig2{cwMqro^H{a2 zn;$M0IXZZhTd^aMXzd|{#IHuxy*s)Kx0}6k%AUFmeuKVwAG5ZJUm+m0UbOJo^X}lhjM4 z5)BP5#o`$K{rwn|aQf6~!XV&gcETXU#4)}?4=39Oc8Y0VsaN+rA8y*b**W#;DQw%q(V8f#;rl+_-93ztU#7jioyxT` zjhPHRy}evGcb2t%>(Gv-TrTtNH(%kp8Yu<2rWV@T+7MEaYg&Zorug#nkE2=`sK*C( zN|^C4*zwH3Pxo!;Z|&;rr0n|?i{ogm87&lOZfPNo>y%368+HnX5saxLq{Ox?j7iYi zp>4?$RxDqEQi^ms%gDvyz?gW_Ac998eY)$fowL5v`}XdtZrSp%>o^WkY!E_VSr#9C zIK%^+HZjwV);5iq45>_(IL8VTa4KKaPj9ZP5S%({W=?A>?B(~cg^ z<{A+~5XUho&&BsE`H6`M`OuaJr`frytCQyD7Q(QK>!mQpaOwLCK@``oKDPDQ_PL7Z zG;lNKvQw+os8;>pa&c@@2!bb`e4%Upw7)R`;PuyDnPmq+DKR3Z~a#P z#N!d>#g{A5f>>1wT$Pjz;?TH6Q#UM#`M6GU@MJXC?t zKK*D+D~*s6A#g3NlO0{%uB~m9Qq;ujSlQHq6pH+8cEK4B`~=629v)L#xiK%6?Ck1x zZO5TLS%(l3sU((V5s%j)rNp*9VzFA3)&xPB!GY6UPp2xL;=VUA-iU@)-rIJr*0{lXOf}i7;pMRKlh>I3D)W0v6vM+q{bN;{*z75Y(_|d5Fn5^j)xGETs}i~<|bhn5CLHraPg1dC>H$%DX4k_ z2mALxB%cFl`Oo&n% z%d%){Ud71pA4E|UF$c-28z`5{mez_O2(TTO*?bC34~zs+7&kUyolDen2Ti90#XR3rv4$9E3mq@o-hnZ#A}dR zQSg0&u*{9A>twT8en0;!Ud%x&jb&*J5k-HNj;>8Cg=EzNk%`JPGc(lGxTI1O^z`&# zOvJgta~M-*>c)3SKq^Jd^Jr`9U@0U85~&oPSHlylS~+>*cvQ7Ob91A)b?YWCZ`;P; zz#!*`hOixnASmHD7E%bhHg4i!k(^iHUhJ~jJn3|r9euBm&E+`v<4@R*jb#+(5h1DP zhR?OHbC$<}lqooF#iY_!|u|^2oH;7V`CF*Ti4^dF_QI-oIG*762rx?6YxMt zx~_wif@J*)nwy&uQjx4*i7_Dq-=7LfMPKdSvtL$hU@`2%z_1jOmev>(;W#!8@kZ9J zS&LGNc)X6$kqiFh)v;-V@OQrccKf||SMe1eIkc~|ZTog>a9|M2(iPZcGWokm&h=^& z31W#l)~s&9^IW79IF84}_^2NS<>{Tf_O7aidj$oVOl~@zPOrR!T`F}2$8mVFeI2Jy zpQ%9dUaz5H1;t_k*Nb6{Vf^n)eh`*#zqae0)zyL*+yKD)?;R-g^}XuawoMQkgb--0 zDV0i`{q`Gn?C4`5uTaSOS5p(yLg2sg=DY0+h22*HfDb=7GFF$YMF>F{hQvG<0HwtA rbUK|*B_xfc)t)sIS5;Hh2cf02C0^Dvl2Ss95iUg1VvI;BRo5zRfTW#{`@6_k zEdPHx?$LAqMIqbFoenNJ>5Oaa_@5643>kXTFy9>DUr9k>Bt@&Eh zz^@|^q%K=b3y1qJ3V8 TAbsR>00000NkvXXu0mjfKYNZL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cotton_3.png b/Resources/Textures/Objects/Materials/materials.rsi/cotton_3.png new file mode 100644 index 0000000000000000000000000000000000000000..ffe0941d2ab582f77c7f06d88051ec045ece0d42 GIT binary patch literal 399 zcmV;A0dW3_P)xy?!_yHV%#1wGp+rRF@;nDK?~b)u z01>&%xfn_2WYhJ_xj@iT5RtRiI%}-lDU>#EdQ=+AF|Ha-^f_6YsW(L5`WK~UAGo*f(nL$-kSTkzo zK11r5mtjrFu0GHXNC3a#KEEuQUdA=;8Ee=jVBT<=UQlKR%nU8j``ZZs#(A*Upja~6 z^!-oQwM;%ABu7Owy?~j=jDg#Y0Dnz+y+?JGH}s($kQieU03V@aM?^$C1V3ArmhHN`T+RRh002ovPDHLkV1hH3u`>Vw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c9b55e9daa52ea2f352f43917ffa03611e0c5512 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=%RF5iLn`LHy|s|{umOY1#mylX zY^^-3yfPA(edLloEV;zEr7bqo(RamHcz|!)@nuB?VS8=!u|?VuZC`o zUR7Yk4KW8u9@ud%kK@t*x3;R^I6l@o}^D%)nsrj8`c?H}B8XM>QY~ Mp00i_>zopr04hCGUH||9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..295c2c4eca1dddeb5fb91200177af77b78a76710 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=>pWc?Ln`LHy|t0|kby|c!_6)S z<#>eLJWrcUiEA{R<2XZ6_imuV5|LvZ1xswc)K7i;=w-}~Po6-XAkfgBGyPW8X}hy? zqMGwAZLqoReOYtqbTj`lOZ;fux%XP0} ziZxE(?XvSv@R2hRqk!arYc6kiw(NPse#PZ2&lZ#4jHZhpm9p*Xx*_?Z?|(VNf%+ZH XOP1v>ZH}142-4%}>gTe~DWM4f-Dh8( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathread.png b/Resources/Textures/Objects/Materials/materials.rsi/durathread.png new file mode 100644 index 0000000000000000000000000000000000000000..3bd0660f7d895674fc0a4e1f881ffa91f6ab76ca GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJO`a}}Ar*6y6C_v{Cy4Yk1sWV^ zm>9wvrkDA@@TBGnEkm0fwfzro%!_oH?LCQkP0Xc#vu|b?dU&r+m>R#oNZ50lv4MfX zh6#%#*!I;|cZbF}hITeKD!#SX>{B?+I49;%#8LS>c2-hMTlg6j9Ua@2`@c_^s;ti9 zQM7hl<&*ljxVSx88FEZ=`>yf4zqkLm*7sLW`Pxb-v`mI*(IYT3Em0J(vx%3F0^(*V#LAishx zT?hf&bx0wk1K3_z+pdGjbkM5nnuhIq2US%`4M<9A1%bT%-Xd$?Yn5F)HU{-2P4 lF5ulpmoB@UVHk!1fESx|V#6q^A3Oj6002ovPDHLkV1jAqeJlU~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathread_3.png b/Resources/Textures/Objects/Materials/materials.rsi/durathread_3.png new file mode 100644 index 0000000000000000000000000000000000000000..298b971a7be7614052d5c855b51cedb945556a0d GIT binary patch literal 346 zcmV-g0j2(lP)w}40_5^+RnvPzQ;wcm&9@S?0xlodirI0-OAZ-Pn87Eqe(*FjgTs)3E%LTf& zK`jYISpfiU*9%Ci$-Uk&nE+{(bZvty7k^R!mKSo?5uEQxy0#ey){+pakh43$5|8H- zAq(kr51j9>&b%w6FJ3nxN50#i(6tSQ-hhwDl~0$&q*bz6!|wK{@ta7065xbf@cMOF vV(1NyB)x}w3$TPpU(e>@FA#}DBLB`eA)0xRHw;LY00000NkvXXu0mjf7j%+s literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathreadraw_2.png b/Resources/Textures/Objects/Materials/materials.rsi/durathreadraw_2.png new file mode 100644 index 0000000000000000000000000000000000000000..561edede84a22e06e1807a11047093d1954ee4ed GIT binary patch literal 420 zcmV;V0bBlwP)t9sWhx%U38FZ`Tn81<7M2ZX$EB>HV=1+Fj5xAPSN$V_1s{HF0=;004;M1gj7-iW2~U=Le{XV=XGU zjA@zB?tl`Ves^tyl+$8d2j|^``FuS;K$&MqIYCw4wGCXxP!q>ydw6);wGF5ci#p%$ z3{WAQRS3D+9-hY4LUwI)yHnMdd4|*Zb&*;lIGy2?d3F;_Ibmrb)mcXz&=|p#RS21K zg3A~HJha^N1MGJh`pez4PEMo$fJ(ZwaQ)@_MpxX}zGLywv`0R5SN#DFp}ZTVlSw^%Hef59&Xg0y0^E-}{t O0000@P)&dkYN>4GlHXp|LtNw(edYH+98({QpGyqg-Ql=XsqivjC91@DB2wlfL?!q-^KR&0|43` zkGWBdbcE|Tl}uFbfQV*)Z`Lb@%H-}>p;h+4<$T*6kJ%((s0>p1X1&679Ogzbp2la- zZq_SIsB?90%M6%MxBM=4JdMBImq2dTt8`7OpG^Xm+u|ZCjbOQ@HJb#f;7}Rz0x936 zOJzAI9YGeqiybP1>o@>sEtk;V*tJ#MXh^4+F2C1k&YNo<8)0%l*d&!p|p8C zjhRgX_Pd1l=Tr4_qX5!wl%0ms5N62>WV_>$98T3=3Q898PC~5=2x4NtOZa$IBnR+Z zxO+Mo%ZBoBJQg0qs|*0#`&bc{PdJ&7P?p^Re}dn|zP!biU&~j$4U1TAX+1s!|66rK cL&Hz_1X%gt7kqpS@c;k-07*qoM6N<$g4({?NdN!< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/goldbar_10.png b/Resources/Textures/Objects/Materials/materials.rsi/goldbar_10.png deleted file mode 100644 index 3c88530bca3210ed3b23a30d46f21267ca75d424..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_ueFN3UcmnU5a0i6k^i4e{{Q7tYY^We4xi0HIgXMbzhH*{ z5ODQWh!IfC)6>NO%ML3@)p(Kz62HWNB&JkWqN+1*5UGa7^kXcS#;1ghB0e4yp zFkBoC$x*)mpLSO`?(6rS8Oy)RL8buidg=Mmf~+DDc)nu_ZV!DvXpM8j_)>uG8ayK& zM-j{R--9K>n0W%puKlMu22H+0zzUhj&A_B*hSz|7Dpv$7EI=htWIl@~1j8sDLT7Pd zKL`*`Mfl=kVJ!4l97zC*(8>#AsV^fGVNXVSE*(Z0u&_W%QY1393+|=hdBq^IH^=|iw|4)|IYV=Jcd7x@c=LY{40RZ=r$AMefT}P zC;$rIOn;0)dI3;jKk$y3m(Tl8b4cFT`Fa=ZP*wf%ILU!9uZ5wPa0`HLELV*X z2(nt13l7Z4dVs5%=1J_%jLNS-u9}8RGgbiMdN0T_S}Dyr5Eo`_oInWy2twmrW@KA{ zAmYp5AZ*R3Z9)k|*%n;a5|1#k?Aa?@X7IdSS zm-Ur`0L0gO18lA#y-5c_tgjR#aBUo00kGg!6ZtzUWm9k}Nx(SasXS*+eQG;oUYKir4>i4t zT<>s|S>}g-IW$C93AT5us-bKeHXP|Cjw6o+x5|QB(4B zDIVn>cJ0>C003`4R8&es&{Ouf*3|cqObN-9Q1y={d8TCS7du3{iQ}e$;rijPTlD&+ zCk-2Nkz(F1cRMu~5!*tt(_IkpJ%As2oQeia`Qm;W8X(rIRZpI&O21Lyt?P41|u7$&gl>+=Fa#WRDFH>+4N{dFL}u+QGNL?}&7!1aS|rd>_?Z#PWUf zqE&**k59{SgaYsMEMHi~)K+CNld13b7#oCKzlT8=?^}P#x6muY*T~F$cZPKXrfqu0J--!dc6fsO#lD@07*qoM6N<$f=Xs+ AF#rGn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/hide_2.png b/Resources/Textures/Objects/Materials/materials.rsi/hide_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4db94c3566199ea823738a348ca031e240ab1942 GIT binary patch literal 986 zcmV<0110>4P)#XUG;-#jBe_Y z06?pQ^&EwkAp!6{aOjR9aiTy+R4z-V z$zu`E!{%x=w=M!HnqJ<>hoPM6XqeZwwCPgBg+L`-q^1=KC4&;VL|s5xphi zS_rO%K=`+Dxq}*zRm6x2cJ>=WS8ypvr~X;N>ofL!MC&${+@SnK=Mc-^O{I6CBqgK4 z2VL+%);Lk4O1!@j0oZe6jmQgK3QDql;AJqsnh^na8qqi1?g%)HsX!8mEKlVMkCdWh z3{@psi7j~`#!dfJ1R$1aThp--JnHo_kBGA8(TXPO^Ik5AVImVBO1BR@F&9b7dY#Lj z0i6Xde%Nn~kWoCKQy9@yr{biCWxdWN5n&jn$^FocB_|_nk3yl$gz^PKa!3tpDU zOav}Uy1ClaM-M#(u-{iEu(g4X7cC<3=%J^faVfb1K*RXi`m6+G(hXbi@sl)WYXj|s zO+w>lF%9E$QhmT*-4hmNKU+VHJZe$Q55K&an13Px%f2rzUa6fWv<2VjH{6t8&mO4W zPrrN5kok4=(+(%q2fPkG&P3u|3$}NC>5EI>g`;?dM9%M{6E*>Or!B4-!%a!&VRN;a+suFN zf-kRMM@X`m(G6t;#&>FaUr&UpD7T%I$gA!h7U!O)MT-WpdLOA&U;shf=XLOrhVj#w zF%q_(QzZE;F3{>)uDDj$3SD5;vj_&Q+?re@xjhf+iLm7EjJgh5o6nILwdJ@A zM%!gKK9l6XX{*qRmPCfy9Ey`a8_2uB;xO{q-u2TKOq2YcwDAWm0FIMZc3;gtID1Gu z>~Gl3l&~0gK__e?(K3)aBIklpB?=`s=^xHfyuuAt>ZLJNk`-|B&lL^e@BOGc z)FK$1#YvnX;V1O(_vdn-b3qXS3v0`Xk^@JByOg4YFH9-7zA#iLsn?O-(?S&{Dq!*W z333>DgeY%C2nP9`zC86m_#&Y7j;qp}4pTa~fxd&VmSP4u+D)h3|-$BJfr1MNV?7LM`fp0TIDTATVis zfS~a*p(@UVX3snW7MrV0eP1q98J+=o$rBt=297f#Ig~ZdB)>8NNL|r&Qpqn$J_|0@ j0*hJ{gW*br|A)mtC@4p^qd69h00000NkvXXu0mjfkL2u2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/leadbar_single.png b/Resources/Textures/Objects/Materials/materials.rsi/leadbar_single.png deleted file mode 100644 index c0403f6aedf31cab1d6e71cd64945570a66af97f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_!y=1gGOKdy`VO4Ecjx(6Cl9x0F;kxaCD==X{DK+&gTd1J zWxs(!9-c0aAr*6y6C|n{0vUSsmuNJcGB*o!d2Fq{=!0)_ujs`e9!#F6)Xq8B9lGG6 zm?~oDyl8;|m%K*9GmdR8jwb1wR3Ci5wt$7(lH$c19RBzWx_%@7`!WY^1C;`vP#^tij z*Pjsp$Gs?zl~U$o4LBEo&U~#dh^2umRBn0`!Yf$>R}v)+!dOyvGtz#P0`ToupY7d! z!<@(b!z+*FYUbbyRWJq$Fr*2NfHX}hI~go0#WEorNE%Bn0FxmzjaO?nPkakdxv_Ug zWQ;+Y7??7pWE;fNAWpK($B$eyr_sh~0vmM!WX7&*V8~+jlQ07brc#*W|CPx8U-IF& zmt|k}1xKB5I)FCbs0)JFpyp;11@U;#QHAf?TyKMKU5~YtQk(`*bpZt7K<0t@$yz2Q-N>J*k+ zn@+y#r{kJ zn)#`FUU#?}N=lAEDMb)U92?@H!m=P4pO1=fVGDzUlgm5%!h?FjbdH?_b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/leather_2.png b/Resources/Textures/Objects/Materials/materials.rsi/leather_2.png new file mode 100644 index 0000000000000000000000000000000000000000..22c4fc77e62f5e811b8954d9627d485e5ebb00cd GIT binary patch literal 894 zcmV-^1A+XBP)&V4nVVE z^TSWS-}tETX{FA)e)QTMhu# zEtdlK+7_RACLl^+_llh<8bzj|=LHQ*Bh59^OnSZ?O1tzJ1zcpX*D(MI>^K@)UiZFA zW|o641p4xSVaWem9=w`J?|si;FpAd`P{4Z~gD}--JMy3~UFIB7`>w!M8a#6~S0;qu zO$dPlU=Yt%VyqERc@9$z5VV~Ym;y|)_4%)ou^k;1Y1b$ir4s!0WOYr~YM|G)0C*dw zJQ>UDv)grPe{R>ptw5`5HQJ7jYe@KL2BVav#|8_LGaM)EZTn19c}VRReE;LG+F+9N zWyhv}C!pJMNauoI{*HL|ZqD(^9N)KASMA(r8WQ|XD8Zwp=e{SyuE2fIV0@Zhi~zv< za8b^`x#g7O$*f>R^9EF#*=WBJtgZ+M4d6Whk zwt*0WFwScl$d)yt>6uuD#?f$k<=fz+-UHS3hcxh^hsh^B$<7n1YT&vrqK$3rKQ?E; UwC@~)ivR!s07*qoM6N<$f+C!%F#rGn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/leather_3.png b/Resources/Textures/Objects/Materials/materials.rsi/leather_3.png new file mode 100644 index 0000000000000000000000000000000000000000..2c9b4b5637e3c52006bc5bd2197aef9e01fb9e4a GIT binary patch literal 936 zcmV;Z16TZsP)1<(%W7()tphaa6BI&$yoz6-$UAi5W%fm0Alodv@1{Ue6ipU|3nUIw z8HtiKk_FNtO-dpsi_uV|EjyMCw2S&~W`^L*IrrW(cP`x6|J}6fY~I`LiOItxuroy?pKIt@PR-ItGmUgEJzorkoqLP|&gZbxHUJ6iI2u}3^}b9d z&OjFeeeu6AE*T@;B68!CWc}-Vppxd$lcps!Z z9m(sn-EnDsW>>@Vamc|gPF(}j1qP>eI}_qq;d1~Pf`<#weNTp6f%~4p=r}za0e}y| zteAg&+bPDQIA?r3joR1&W7g{WK?v1eGyh1c>Z>|?%i!NLu3C?f?rt! z`)`&}`Mhm&GRYm9_oO3Xku(RnCrmWP!nNs}d!F|!K z%d+|Mz0A|-IAy!z0uaX4O49UnJm+jVIT%a;Dq-&rqe26!6tAs;$;q^$fiTVqWBDYj zrx_?TPzEoPQIFBJHBbhH%WFW{f1-hMukf#H;B=$1vLAT#;JyGEdSyxjicDDp%2sLM zcBu}m>XI&ONLCRklL3l~rc7zzo2_P{fu{$-xh>kII-!z=ZK<@KjD@TunXT5b7hLS+qHwky7|8~X^tltnMsJ2AEZ0000< KMNUMnLSTZ_C%CBq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json index 2f2e9c6d2d..47b129849a 100644 --- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json @@ -1,80 +1,114 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/37f849fb17014f689346f7a9a49fab5f5562cf18", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "alienhide" }, - "states": [ - { - "name": "alienhide" - }, - { - "name": "cathide" - }, - { - "name": "corgihide" - }, - { - "name": "liggerhide" - }, - { - "name": "monkeyhide" - }, - { - "name": "banananium" - }, - { - "name": "diamond" - }, - { - "name": "uranium" - }, - { - "name": "wood" - }, - { - "name": "wool" - }, - { - "name": "copperbar_single" - }, - { - "name": "goldbar_10" - }, - { - "name": "goldbar_20" - }, - { - "name": "goldbar_30" - }, - { - "name": "leadbar_single" - }, - { - "name": "steelbar_single" - }, - { - "name": "tinbar_single" - }, - { - "name": "plasma_ore" - }, - { - "name": "phoron_ore" - }, - { - "name": "phoron_sheet" - }, - { - "name": "phoron_gem" - }, - { - "name": "spent_phoron_gem" - }, - { - "name": "rods" - } - ] + { + "name": "bananium" + }, + { + "name": "bearpelt" + }, + { + "name": "cathide" + }, + { + "name": "cloth" + }, + { + "name": "cloth_2" + }, + { + "name": "cloth_3" + }, + { + "name": "corgihide" + }, + { + "name": "cotton" + }, + { + "name": "cotton_2" + }, + { + "name": "cotton_3" + }, + { + "name": "diamond" + }, + { + "name": "diamond-inhand-left", + "directions": 4 + }, + { + "name": "diamond-inhand-right", + "directions": 4 + }, + { + "name": "durathread" + }, + { + "name": "durathread_2" + }, + { + "name": "durathread_3" + }, + { + "name": "durathreadraw" + }, + { + "name": "durathreadraw_2" + }, + { + "name": "durathreadraw_3" + }, + { + "name": "hide" + }, + { + "name": "hide_2" + }, + { + "name": "hide_3" + }, + { + "name": "leather" + }, + { + "name": "leather_2" + }, + { + "name": "leather_3" + }, + { + "name": "liggerhide" + }, + { + "name": "monkeyhide" + }, + { + "name": "phoron_gem" + }, + { + "name": "phoron_gem_spent" + }, + { + "name": "wood" + }, + { + "name": "wood-inhand-left", + "directions": 4 + }, + { + "name": "wood-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Materials/materials.rsi/spent_phoron_gem.png b/Resources/Textures/Objects/Materials/materials.rsi/phoron_gem_spent.png similarity index 100% rename from Resources/Textures/Objects/Materials/materials.rsi/spent_phoron_gem.png rename to Resources/Textures/Objects/Materials/materials.rsi/phoron_gem_spent.png diff --git a/Resources/Textures/Objects/Materials/materials.rsi/phoron_sheet.png b/Resources/Textures/Objects/Materials/materials.rsi/phoron_sheet.png deleted file mode 100644 index e226d3fdb75514ae2a5eec67eae43b2c4c970fd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmV;-0W47!8B4#wjMlF|U!u)-3CM~&H79Rha{vi#aJ z43*k;3>^&Lu-Zjd2rPb&V8@&aR}T&f=G@D zj$^27T?1z03IWm`00U5mzyP{~swYfksEjNHv)liFWuzz@5)=2JxUNPPxO9>jqX~xq z%<|R()VM|tYHSWd_B{hN3Zm+LkgV0}1j%yf@efOkAcw##CkEhk0Ibjf189)K90CLA z4nmFwnD6lcyiovhz~hJaQByX0zDG`smrh~?Jq(Z>1u);Y&bd!8-%|o`hQLBIMQ|#F zM}ZE+r??U$a-PQ)^kgT(MY|6}7*HCNzhMC67;JG*3Lq*Q;!*<-9ZAIE1{N?dFaQ8MzsTt}pFFw%0000scUXbPwSKjiM^8*oa)F)Rvx`E(yOs!g%}%n;jQn%#$?5;MH7pt)`#e(m{99dV#^y)z4*}Q$iB} D(IRP9 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/rods.png b/Resources/Textures/Objects/Materials/materials.rsi/rods.png deleted file mode 100644 index 853ecb2da51a42b94cfa174ffe8e3cb536a1b086..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND997w6XFV_H8eCb($ZX9T$ZexvINLyDGBlmX88aA|7Kl>4j@0u)5S5Q zVoq{`f+UMW<}&U^z67@ImvcFsr(26FZ8a_Db~*WWleU2B&h6d`UfZ6>F&J;Vd-okf zXwmc{)gA-Yo}Jgd7vvSRY9#JD#ak%5yIIerZR$dnyZRQ43~?svt>?8?{Ri5@;OXk; Jvd$@?2>^PaLJ9x? diff --git a/Resources/Textures/Objects/Materials/materials.rsi/steelbar_single.png b/Resources/Textures/Objects/Materials/materials.rsi/steelbar_single.png deleted file mode 100644 index c857b6f924cbd9321d9fc89d3d3d5167dfbc986f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2)*6XFV_3knK4J3D92oVjAf3LhUIu`+RSpeS2OkY6yve-NmueDDt_ z;^OJz7*a7OIYEN0A&{Y0e~CuJDRZ+xm&exHi$3;>Ui{&~hJGQTByhll;bD~@(X78 z4*^$Cg%|VJLn`JZCrGe42+UpIqNTJV=Z#9kDSlHShlk50l{p)JdN955I=0Zk z?odFPqpFBqfP+9QzmP+*%T9$|#-~62%$&f$@Z$g{ WlML+`?JYD@<);T3K0RSeS BODX^W diff --git a/Resources/Textures/Objects/Materials/materials.rsi/wood-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/wood-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3af74a4b1edb93ef6537d036c5d45587ffc77b26 GIT binary patch literal 435 zcmV;k0ZjghP)=@26Co2COF0U{zIA|fIpvf!%HTaKUN!FmE$m43TfM;Dbkek$_-wwpCheFxzG zcUJy>>O0I8f_VU^zC+UvDDo_7e355p+F`a3%ma|(n|45bIIb>@tq;dlIDU>0)B_kV zHnw>2R|r;A1CRqu?A^|%6fb@Y;q(2?WEUhY>=G$H{LEid{P>yjoFdQgT7RgmSE%d& zi{gQwJHf)_0IZ4^VF(sf7AXgxcJbpmES{^zRi&TvUsxg{A|fIpA|fKPwbbAH%zJ}$ z11Y<8u{$6(gvA9Q{lr*{3&65F6=lwE3s;qX+%`|0|50;6d$;pX&o2OA-p31@vf*o~ z^Qs0QE$pvL5@sQcJJQ!)!~hfn2rn}Lb|GlDZq}6b9g*s8?X9+JO@wWnswyGGyTvS-D3RPLMOOMLj?lmP(v}AyEbnL5IfFbs*Rc zc7Xif7R4C9hYbinfQX2Qh=_=Y03eB@`q5(;(ye$FZH?Efjn>W%m6{XCy1xRm}i1X@IX%jfaxW{BzT}_3CQH-0ARGsAc>>e+Srmf zs>gceiHL}Zh=_=Yi0FBle7EfVEKV15{Ti$_1Lhh$V6X(jz@KFzv=Y#@W&U*38F1Kb zo$eIbIG52=AkA`59)!z{Qc?9G*DMU-#qF6#sN{>m%K|*{;pnWNjMLC3c%zYai>frB0*PMmt|kXBN%WEk@h=sEUt` z(juY(!J?vof*=$Hd1%G=tB4>9f&~S^qLqiB7M)rIt?pxMvMlRAJGtkcbAI>yl9O}q zJtfz}gAeTccpm@&2SP&vBSCw@t$W@A_rQkIVbFMFMFt0WXh+UK!C-HC$jvMO*zfID z4}d^A3ILu-*RMqffrn%=hEB%NXcz|VA)Sf^7mJB!H`VYswNsN)-LyilQIBv1f_ClN-dq%$V^7P%jMYKa;>f|mmnah(t;{nQD0BXkg!wzR5GcOYNp0! z^h)c(?4s@Y>dNAl%ek}j%H`VZ?dG)d=^~+ELOHC}$Sme(R*PX{&F2f-@w_Tf? zFLSd~e=E#D!1EFCJO&M?R1E2+#}~j%>zvItx3p+nv0FFRSJ&58>@TcKOD5yIUZ+#= zxwO6>et$2Y%c*~eg|Qn6nyFFif??4%zxK!S`kLKpo!3t*v{Pehm4w|`os*r?%p#Ye zpryz{ECz-tgOLbmG6}7EDzR9e*{rkn7YjzCUaOH$C`H`n+GZAk$Ej;;rHx8^7&L4~ zdJ>;YEkzb!F%J-MNEsS7*x$;aRmw&OO-9|MTB;ZqHZt(_WGw3uzJ*5}9_pBXu3xm7 zvoey2HD$jSW>#0B&?qRe1|<{R^#qL`uEXTl@k7^{tovH~5ubISQ)v#HF zd`McmpeaB17PK&<=m7)<%|s${t8j1%1=rKXk&g{<*(5d-pPCY1S6kk~r&r*RL;|L_ zn>#LhB9{$vSi~k~RZL6_NEC}YWuyHgl3wXZpIr7tBJSz$r@D0$`&cDeH zi^2I1(P6Q@4jg9BziQsy1vA_-E_&6~0)DjPp@CPTA*95Fqh1}rDeto!>kyT9VhL&OE1AQIN=oemmK8xH3lV-v(e{<8e_ za^J?W^FJeI8M3-K!EIe%;uWX-r|vK54nM!8nfBd*!S9PP$4%l2#Jxmu1nHY>+quuJ ZKL9|7f2{B%gy0@gKxj~SASWQ<{+~fg7NY*ucn5+@F2Gq2m}JbpW*`% W9f6^}UI}3U00000y@r~Js{@B(3&(-kC#2n7WEi?`)~6llaxW}jP_o**?{aoR ziqhg<<)u^7@_o3gJT7rPZ{JmAZ!GxA!PHQw-dNl$fb~tK%08jS(+526Y@4GJeuVKj p55rrTHEDb2%I;qv;Pj`7o6Ep)`b*t)+&~vGc)I$ztaD0e0swM!Mm_)l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bananium.png b/Resources/Textures/Objects/Materials/ore.rsi/bananium.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b3325f410ef86f3875cfd0bc1899dad4e459cf GIT binary patch literal 286 zcmV+(0pb3MP)3Z5Qe|q=oz$7w6ymEf~5%FRV;gdWJ_sSn@XtR(5-<$I zFg}bd$z@5djZfamb**(y?9XeL^k_d5NmZFjRpl81NFOMVJVVxdS~~BM1_)L8?HqAF zBrG$_pbj_>hdmvX)vFC8J-Vw6ok!JF5d&TscdgIARF&rphsH_M>WWWC$as%rg0sU2;gFi}@~07*qoM6N<$f@a@%djJ3c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ore.rsi/diamond.png b/Resources/Textures/Objects/Materials/ore.rsi/diamond.png new file mode 100644 index 0000000000000000000000000000000000000000..5a6de137f4414629aee8dd5424eb1a47b8c22c1f GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR!#d8cTw50@SegFUEu8Vac?t&ugPs2=ooh>~T54|h@776Gdsc31)Dpox* z^MX-axkKjqwN0z1-;_Ue=lQhgCFi39tmXCA{}py#x8xh^z2Z>2uYsDa5o*_8@IH@f o4S5~e|83t4sp)zopr0Oh4il>h($ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ore.rsi/gold.png b/Resources/Textures/Objects/Materials/ore.rsi/gold.png new file mode 100644 index 0000000000000000000000000000000000000000..6ac90a19ed18b7f4549fde2a6c813584cda0a279 GIT binary patch literal 354 zcmV-o0iFJdP)*klBG~6N}y9{C#i~K3Pq5H zriis5*ugue6x@0#g2=u3j`!|6&}cLo&40kFxzewiGS6LOU7=q!W!bT5HZ1Z)Y^ogg ztEQYA2b3L~O2J^!v1Am^=#S@|U+xl5QsCit0=$|lo2U0&wQSPlnv;e_6wcV+ae-R^ zibBv<(ytic)m&M2Yyc{S07`YDFd+Uo;-)nvPPPHqbDk9SieIpN@nZnMa55!MQeIx) z0BGNRZKwvUd?8z*QV8ge4|)GwEaijIv$8m2<{907*qoM6N<$f~qc< A0ssI2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ore.rsi/iron.png b/Resources/Textures/Objects/Materials/ore.rsi/iron.png new file mode 100644 index 0000000000000000000000000000000000000000..2f5ad0a16ec63d96bf8df394c17bb176e4fb28a0 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJwVp1HAr*7pUNYosGLT?>(Ed6IFp*R%l;-6xWR>&YYHG+|Tfq=WaAHv-=pQ~V@*$NH;1ClH{G(xeqO-mfg zg$5IQ#tsViOm_))zvq451BF7NQ2a++$4XqsN;YxVcA0SF>YBY{gH1^MNI-ik;MmH|;2in+a07*qoM6N<$f{b*W`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ore.rsi/sand_black.png b/Resources/Textures/Objects/Materials/ore.rsi/sand_black.png new file mode 100644 index 0000000000000000000000000000000000000000..cb5732ce217cf885e9198785f403c3bb08860146 GIT binary patch literal 284 zcmV+%0ptFOP)If7oWft15XTMQIG?NPN;H2v<8lQswc2YB`zzRTwt`cEtq4F}*T2G-p=V*Y i1&(Cyh8l)p{3+fb`F73b%Mtzn0000^OigoOjb zZ4Xl@mZ(}Lg<=W2Ug6=X-x1II;O*Uw-+^Gx8=KoC5(!|Cc95=6ETL)I_x^zE%kvRo zVB#B?I)Z#YPpwwt=x`rk_~NUU$?jG^F+kNaX|=nNQiq8&0$_MKz}iZNp6iY51;RjN q@u>#JAuXr;N&lmY3j_jz0N@MO(4@FCrJL#i0000M6+ z*lCs+K$0YTNZ;CSM8%@1to9X45Y)awVUdaJOYMWAx1pP8=VN{pPgr2=+cv R%>Y`>;OXk;vd$@?2>@3GJ|O@A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ore.rsi/titanium.png b/Resources/Textures/Objects/Materials/ore.rsi/titanium.png new file mode 100644 index 0000000000000000000000000000000000000000..bb9de5bda372aa462163dff90bf670f7080bee26 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFiLv5IEGZrNluVpU7R4&(-deR z;*b}6|Nn*)kNz8cYp{55;AZvz;@7|a-LL#7`c5L}m51r6ZSJ>g5di&M+Pv)$%AATV8TPV?*1PX)jAl~$ZqSf_RN01y;>y~5X4Yh5Oo zYIc#&fqlb|d3QpNbi8q3V`FPG*T1*GV!|tiX%hT%_O=^4UXp2X75ndgPWH(x=MX&y z_9`~F|2J7~Jly&C)k@hXxBTZZgKVC6*Zwfjbl#Jq7g{{|6s#9oRPOkjp0L2VNg5Ii biTn(5=NmTW>zTz|dqz1J2T4u`|>ACQUCGEsVwvnz`V0kZ3KNhV5f@5IfLnYWE) zy|FDG$0-1H5ple+XV%N7XI`gMGqy=&xr;pO%^1fibrAvJ4RTIzFO3`^5Q0DmCS`@q zwODmPCQ2U;4*(cmoq?ajTZEkTj1>4%J=k@i^BcI>J>sr>G~@4WHy!eGt9aILKqg8D zLeO7d`%ykAD_-{R=kjyA*qu7iuCy&)?T0*U`cOo8gPgjukGaq*Jj)bTIJrT##yUa#KG%i=)0x+NSjymCV|74kKG%l>?aX^VEM)NC vBmJP4`M~4FDxoehg$q72->c9OV{VY{bXtBcGuna!=q?6NS3j3^P6Ue*8Y7Wq9UTdp5K}H zp0lQuy6?~e_MG*39H_OTlybW?z=~4>THLbGfEGWy`|yBI+;aS30ke2WfCqO6cyU)i z1U?-Qg--=U;==*a_)q`?HwUnAQveeOfbNGxMBgX_2Mi~`#7_er+eXE^0V6*Zo_+mr ld-qHn=$yb6_}Ur(yZ{%*=8=Tiid_Hz002ovPDHLkV1mLQVC?_^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png new file mode 100644 index 0000000000000000000000000000000000000000..eef57cbfe9dcf5d062a9141c9423e1bf66eb2be4 GIT binary patch literal 262 zcmV+h0r~!kP)*gf29)rIeU>dss0000Ht0=)O86yoI61SEJmyB`P2=P8E&I%#nxK(OjV#4F4aFIpb765(1v#j%z!rw%z`%w%!Gdwm<_KAtbmIGtKh7_N;psq zBO;15kTx7(8jwH$)ZqX#j=Ayby*Fu-(S!p<0}>p-YuswWfvkc2|Ca!6WdP)h%2| zWt$yhnIC4L9AB0kUzZ(Wm>y%9A7q;#XPqBqoJftrM~lElioiyTz(|e3Nsq%IW}Qin z!ezAOWwqsIwdH5G=4iL(XSU{KwB<>T!yaUsaJ}hrzv^?p>TU_rU zea7#6#qWB=?s2~AaJ=bew&rNK=6S>JfywZg&+3-W>9FYNd&Tc+x#xh$@Po_oh0O7U z%kh`b>VC)XX}ITXy61w*@QBUvhRpGr(du`?>ukE{gUa!V&hebm>x0VhdBf}%SC2o0 zyI!&5cEat5&hdiE?s&uMbinCOl*buakwApKV6o(P!|r&)>ra-*8eEh@hrVL6T|#89%P$!!R>m(?tI1VaJ}eElErht?SIJdc*5&% zyy!@d!g|H;b;0W!UX~$gpGuF!X}RYcUX>$kqD+#;BW$4}YM>xzo*-tN9%Gv6cT%JP z0004WQchCxU^0~HXND&^s5r`6Tn)5{DrK_p|WuiqLN92$=IaEdaBB;<*BGL_DZ zWTQET5{M*KAGOBPc7A+dBEeAtkq7lcwwQP9$*Ji=5IrE8nVmCAR?%^sa%H|+Q$Vz^ zxI~t%qT@K_%1U+B1){a}4Z3WNm2KPJT&ZrkK-93k!*=7z{N7%E|KPB81R@g+dVFGK zQmNwU;n}$fA_WP#D4isem)Wc9f?onrpiW33a(vT$8*NJj@eV}y51bGhd(7qfbk6Vz zM9(jN&M4)a#~4HOzz?r4521P!e$zBJ{NnlT{ljOP-p?b&2mj3%EBG{cVc8P)00000 LNkvXXu0mjfgru3V diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/meta.json b/Resources/Textures/Objects/Materials/sheets.rsi/meta.json deleted file mode 100644 index 0b615bbde6..0000000000 --- a/Resources/Textures/Objects/Materials/sheets.rsi/meta.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "metal-inhand-left", - "directions": 4 - }, - { - "name": "metal-inhand-right", - "directions": 4 - }, - { - "name": "glass-inhand-left", - "directions": 4 - }, - { - "name": "glass-inhand-right", - "directions": 4 - }, - { - "name": "glass" - }, - { - "name": "phoron-inhand-left", - "directions": 4 - }, - { - "name": "phoron-inhand-right", - "directions": 4 - }, - { - "name": "phoron" - }, - { - "name": "plasmaglass" - }, - { - "name": "plasma" - }, - { - "name": "metal" - }, - { - "name": "plasteel-inhand-left", - "directions": 4 - }, - { - "name": "plasteel-inhand-right", - "directions": 4 - }, - { - "name": "plasteel" - }, - { - "name": "rglass" - }, - { - "name": "rglass-inhand-left", - "directions": 4 - }, - { - "name": "rglass-inhand-right", - "directions": 4 - }, - { - "name": "researchicon" - }, - { - "name": "plastic" - }, - { - "name": "plastic-inhand-left", - "directions": 4 - }, - { - "name": "plastic-inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/metal.png b/Resources/Textures/Objects/Materials/sheets.rsi/metal.png deleted file mode 100644 index 999b6e2927c5e073ced4b4b28335b35a95861cca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 883 zcmV-(1C0EMP)h%3S zK0ZG`KR`f0K|w)7LqkMFL_9n^H8nLdGBPeME?ZeyUR_;aUS3~bUSVKhVqjonVPRok zUtU~XTv=IJSXfk3Qz0?Y-wq1Yin$3YHMg{X=i6;WMo@fT3AoiHVSnjgF0tO-)UEczA_^f{~7nkdBUz zjEr$^ZewC%jEahdgM)l~drM18ad2>nhlgcjV@F3vaBgmZetw9Dhk}5BiHL|gIyyT$ zJ6&8{aBXdMbaZ!ic64%bTv}Q*G&EXSS!ZQsX=rF;U|?BSS1T(kRa8`8U0q#UTO=eT zDk>@{C@3&6Ff%hVCnqNXSy0~q0004WQchCKYoFYN}e=I+%8_@oMSn=^Gdt8Jp;-nwptoD6kN)w6eCbwX=7y(RbA1;lNPfV zbQ-Ot`oVsHKqY2m zd26|->l>BF1{nL7NC{(xWL34Zf^3arZDd`&pR`~DW?VEjnF%>dHe0I7w@9`swY6g? zFz-+nZ8EFo;qBzscUXbPwSKjiM^8*oa)F)Rvx`E(yOs!g%}%n;jQn%#$?5;MH7pt)`#e(m{99dV#^y)z4*}Q$iB} D(IRP9 diff --git a/RobustToolbox b/RobustToolbox index 91391e1205..7f540e741c 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 91391e12050daf78411c61a2776f44ccd6254453 +Subproject commit 7f540e741c030764cd08d50c4edb3d37743a299b