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?

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)

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
+    - SheetSteel
-    - GlassStack
+    - SheetGlass
     type: ProtolatheDatabase
   - containers:
       machine_board:
@@ -13777,8 +13777,8 @@ entities:
     - Ointment
     - LightTube
     - LightBulb
-    - MetalStack
+    - SheetSteel
-    - GlassStack
+    - 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

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

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
+      - name: MaterialWoodPlank
-        amount: 15
+        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
+- type: entity
-#  id: CrateMaterialsPlastic
+  id: CrateMaterialsPlasteel
-#  name:  plastics crate
+  name: plasteel crate
-#  parent: CrateGenericonimo
+  parent: CrateGenericonimo
-#  components:
+  components:
-#  - type: StorageFill
+  - type: StorageFill
-#    contents:
+    contents:
-#      - name: PlasticStack
+      - name: SheetPlasteel
-#        amount: 1
+        amount: 1
-
-#- type: entity
-#  id: CrateMaterialsPlasteel
-#  name: plasteel crate
-#  parent: CrateGenericonimo
-#  components:
-#  - type: StorageFill
-#    contents:
-#      - name: PlasteelStack
-#        amount: 1

Resources/Prototypes/Catalog/LatheRecipes/sheet.yml

@@ -1,5 +1,5 @@
 - type: latheRecipe
-  id: MetalStack
+  id: SheetSteel
   icon:
     sprite: Objects/Materials/sheets.rsi
     state: metal

Resources/Prototypes/Catalog/Research/technologies.yml

@@ -149,14 +149,12 @@
   name: material sheet printing
   id: Sheets
   description: Print those sheets!
-  icon:
+  icon: Objects/Materials/Sheets/researchicon.png
-    sprite: Objects/Materials/sheets.rsi
-    state: researchicon
   requiredPoints: 250
   requiredTechnologies:
     - IndustrialEngineering
   unlockedRecipes:
-    - MetalStack
+    - SheetSteel
     - GlassStack
 
 # Electromagnetic Theory Technology Tree

Resources/Prototypes/Catalog/VendingMachines/hats.yml

@@ -10,7 +10,6 @@
     HatBandGreen: 3
     HatBandRed: 3
     HatBandSkull: 3
-    ClothingHeadHatBearpelt: 3
     ClothingHeadHatBeret: 3
     ClothingHeadHatBluesoft: 3
     ClothingHeadHatBluesoftFlipped: 3

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

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

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

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

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

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

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

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

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

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

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

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

@@ -49,7 +49,7 @@
     - type: WelderRefinable
       refineResult:
       - GlassStack
-      - MetalStack
+      - SheetSteel
     - type: DamageOtherOnHit
       amount: 10
 

Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml

@@ -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

Resources/Prototypes/Entities/Objects/Misc/metal_rod.yml

@@ -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

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

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

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

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

Resources/Prototypes/Reagents/materials.yml

@@ -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

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:

Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml

@@ -13,4 +13,4 @@
               amount: 1
 
     - node: MetalRod
-      entity: MetalRod
+      entity: PartRodMetal

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:

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

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

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
+  

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

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

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

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

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

Resources/Prototypes/Stacks/material_stacks.yml

@@ -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

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
 

Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json

@@ -8,18 +8,23 @@
   },
   "states": [
     {
-      "name": "icon"
+      "name": "bear-equipped-HELMET",
-    },
-    {
-      "name": "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
     }
   ]

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
+    }
+  ]
+}

Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json

@@ -0,0 +1,96 @@
+{
+  "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": "brass"
+    },
+    {
+        "name": "brass_2"
+    },
+    {
+        "name": "brass_3"
+    },
+    {
+        "name": "brass-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "brass-inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "plasteel"
+    },
+    {
+        "name": "plasteel_2"
+    },
+    {
+        "name": "plasteel_3"
+    },
+    {
+        "name": "plasteel-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "plasteel-inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "plastitanium"
+    },
+    {
+        "name": "plastitanium_2"
+    },
+    {
+        "name": "plastitanium_3"
+    },
+    {
+        "name": "plastitanium-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "plastitanium-inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "steel"
+    },
+    {
+        "name": "steel_2"
+    },
+    {
+        "name": "steel_3"
+    },
+    {
+        "name": "steel-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "steel-inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "titanium"
+    },
+    {
+        "name": "titanium_2"
+    },
+    {
+        "name": "titanium_3"
+    },
+    {
+        "name": "titanium-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "titanium-inhand-right",
+        "directions": 4
+    }
+  ]
+}