Updates a bunch of yaml files to code quality guidelines (#3784)

2021-04-01 21:23:48 +00:00
parent 2a82fa459f
commit e1a28abe6f
26 changed files with 1094 additions and 1141 deletions
--- a/Resources/Prototypes/Entities/Clothing/Belt/base.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base.yml
@@ -1,7 +1,7 @@
 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingBeltBase
-  abstract: true
  components:
  - type: Sprite
    state: icon
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingHeadset
  name: headset
-  abstract: true
  description: An updated, modular intercom that fits over the head. Takes encryption keys.
  components:
  - type: Headset
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingHeadsetAlt
  name: headset
-  abstract: true
  description: An updated, modular intercom that fits over the head. Takes encryption keys.
  components:
  - type: Headset
--- a/Resources/Prototypes/Entities/Clothing/Eyes/base.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/base.yml
@@ -1,7 +1,7 @@
 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingEyesBase
-  abstract: true
  components:
  - type: Sprite
    state: icon
--- a/Resources/Prototypes/Entities/Clothing/Hands/base.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base.yml
@@ -1,7 +1,7 @@
 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingHandsBase
-  abstract: true
  components:
  - type: Sprite
    state: icon
--- a/Resources/Prototypes/Entities/Clothing/Head/base.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base.yml
@@ -1,7 +1,7 @@
 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingHeadBase
-  abstract: true
  components:
  - type: Clothing
    Slots:
@@ -10,9 +10,9 @@
    state: icon

 - type: entity
+  abstract: true
  parent: Clothing
  id: HatBase
-  abstract: true
  components:
  - type: Clothing
    Slots:
@@ -21,20 +21,20 @@
    state: icon

 - type: entity
+  abstract: true
  parent: ClothingHeadBase
  id: ClothingHeadHardsuitBase
  name: base hardsuit helmet
-  abstract: true
  components:
-    - type: PressureProtection
-      highPressureMultiplier: 0.5
-      lowPressureMultiplier: 100
+  - type: PressureProtection
+    highPressureMultiplier: 0.5
+    lowPressureMultiplier: 100

 - type: entity
+  abstract: true
  parent: ClothingHeadHardsuitBase
  id: ClothingHeadHardsuitWithLightBase
  name: base hardsuit helmet with light
-  abstract: true
  components:
  - type: Sprite
    layers:
@@ -50,12 +50,12 @@
  - type: LoopingSound
  - type: Appearance
    visuals:
-      - type: FlashLightVisualizer
+    - type: FlashLightVisualizer
  - type: ItemActions
    actions:
-      - actionType: ToggleLight
+    - actionType: ToggleLight
    # right now there is no power system for hardsuits
-    # so hardsuit helmet just have small battery inside 
+    # so hardsuit helmet just have small battery inside
  - type: HandheldLight
  - type: PowerCellSlot
    startingCellType: PowerCellSmallHigh
--- a/Resources/Prototypes/Entities/Clothing/Masks/base.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base.yml
@@ -1,7 +1,7 @@
 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingMaskBase
-  abstract: true
  components:
  - type: Sprite
    state: icon
--- a/Resources/Prototypes/Entities/Clothing/Neck/base.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/base.yml
@@ -1,8 +1,7 @@
 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingNeckBase
-  abstract: true
-  name: neck
  components:
  - type: Clothing
    size: 10
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml
@@ -1,7 +1,7 @@
 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingOuterBase
-  abstract: true
  components:
  - type: Clothing
    Slots:
@@ -10,11 +10,11 @@
    state: icon

 - type: entity
+  abstract: true
  parent: ClothingOuterBase
  id: ClothingOuterHardsuitBase
  name: base hardsuit
-  abstract: true
  components:
-    - type: PressureProtection
-      highPressureMultiplier: 0.75
-      lowPressureMultiplier: 100
+  - type: PressureProtection
+    highPressureMultiplier: 0.75
+    lowPressureMultiplier: 100
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base.yml
@@ -1,7 +1,7 @@
 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingShoesBase
-  abstract: true
  components:
  - type: Clothing
    Slots:
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base.yml
@@ -1,7 +1,7 @@
 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingUniformBase
-  abstract: true
  components:
  - type: Sprite
    state: icon
@@ -9,9 +9,9 @@
    Slots: [innerclothing]

 - type: entity
+  abstract: true
  parent: Clothing
  id: ClothingUniformSkirtBase
-  abstract: true
  components:
  - type: Sprite
    state: icon
--- a/Resources/Prototypes/Entities/Clothing/clothing_base.yml
+++ b/Resources/Prototypes/Entities/Clothing/clothing_base.yml
@@ -1,14 +1,7 @@
 - type: entity
-  name: "clothing"
-  id: Clothing
-  parent: BaseItem
  abstract: true
+  parent: BaseItem
+  id: Clothing
  components:
  - type: Clothing
    size: 5
-
-
-
-
-
-
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -1,7 +1,7 @@
 - type: entity
-  name: bike horn
  parent: BaseItem
  id: BikeHorn
+  name: bike horn
  description: A horn off of a bicycle.
  components:
  - type: Sprite
@@ -10,8 +10,7 @@
  - type: Clothing
    sprite: Objects/Fun/bikehorn.rsi
    size: 5
-    Slots:
-      - Belt
+    Slots: [Belt]
    QuickEquip: false
  - type: ItemCooldown
  - type: EmitSoundOnUse
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -2,16 +2,16 @@
  id: Crayon

 - type: entity
+  abstract: true
  parent: BaseItem
  id: Crayon
  name: crayon
-  abstract: true
  description: "A colourful crayon. Looks tasty. Mmmm..."
  components:
  - type: Tag
    tags:
-      - Write
-      - Crayon
+    - Write
+    - Crayon
  - type: Item
    size: 1
  - type: UserInterface
@@ -128,8 +128,8 @@
    capacity: 5

 - type: entity
-  id: CrayonBox
  parent: BaseItem
+  id: CrayonBox
  name: crayon box
  description: "It's a box of crayons."
  components:
@@ -145,22 +145,22 @@
    countTag: Crayon
  - type: StorageFill
    contents:
-      - name: CrayonRed
-      - name: CrayonOrange
-      - name: CrayonYellow
-      - name: CrayonGreen
-      - name: CrayonBlue
-      - name: CrayonPurple
-      - name: CrayonBlack
+    - name: CrayonRed
+    - name: CrayonOrange
+    - name: CrayonYellow
+    - name: CrayonGreen
+    - name: CrayonBlue
+    - name: CrayonPurple
+    - name: CrayonBlack
  - type: Appearance
    visuals:
-      - type: StackVisualizer
-        composite: true
-        stackLayers:
-          - red_box
-          - orange_box
-          - yellow_box
-          - green_box
-          - blue_box
-          - purple_box
-          - black_box
+    - type: StackVisualizer
+      composite: true
+      stackLayers:
+      - red_box
+      - orange_box
+      - yellow_box
+      - green_box
+      - blue_box
+      - purple_box
+      - black_box
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -1,100 +1,87 @@
 - type: entity
-  name: "basedice"
+  abstract: true
  parent: BaseItem
  id: BaseDice
-  abstract: true
  components:
  - type: Dice
  - type: LoopingSound
+  - type: Sprite
+    sprite: Objects/Fun/dice.rsi

 - type: entity
-  name: "d100"
  parent: BaseDice
  id: d100
+  name: d100
  description: A die with one hundred sides! Probably not fairly weighted...
  components:
  - type: Dice
    sides: 100
    step: 10
  - type: Sprite
-    sprite: Objects/Fun/dice.rsi
    state: d100100

-
 - type: entity
-  name: "d20"
  parent: BaseDice
  id: d20
+  name: d20
  description: A die with twenty sides. The preferred die to throw at the GM.
  components:
  - type: Dice
    sides: 20
  - type: Sprite
-    sprite: Objects/Fun/dice.rsi
    state: d2020

-
 - type: entity
-  name: "d12"
  parent: BaseDice
  id: d12
+  name: d12
  description: A die with twelve sides. There's an air of neglect about it.
  components:
  - type: Dice
    sides: 12
  - type: Sprite
-    sprite: Objects/Fun/dice.rsi
    state: d1212

-
 - type: entity
-  name: "d10"
  parent: BaseDice
  id: d10
+  name: d10
  description: A die with ten sides. Useful for percentages.
  components:
  - type: Dice
    sides: 10
  - type: Sprite
-    sprite: Objects/Fun/dice.rsi
    state: d1010

-
 - type: entity
-  name: "d8"
  parent: BaseDice
  id: d8
+  name: d8
  description: A die with eight sides. It feels... lucky.
  components:
  - type: Dice
    sides: 8
  - type: Sprite
-    sprite: Objects/Fun/dice.rsi
    state: d88

-
 - type: entity
-  name: "d6"
  parent: BaseDice
  id: d6
+  name: d6
  description: A die with six sides. Basic and serviceable.
  components:
  - type: Dice
    sides: 6
  - type: Sprite
-    sprite: Objects/Fun/dice.rsi
    state: d66

-
 - type: entity
-  name: "d4"
  parent: BaseDice
  id: d4
+  name: d4
  description: A die with four sides. The nerd's caltrop.
  components:
  - type: Dice
    sides: 4
  - type: Sprite
-    sprite: Objects/Fun/dice.rsi
    state: d44
-
--- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
@@ -1,8 +1,7 @@
 - type: entity
-  name: basehandheldinstrument
+  abstract: true
  parent: BaseItem
  id: BaseHandheldInstrument
-  abstract: true
  description: That's an instrument.
  components:
  - type: Instrument
@@ -15,40 +14,37 @@
    size: 24

 - type: entity
-  name: synthesizer
  parent: BaseHandheldInstrument
  id: SynthesizerInstrument
+  name: synthesizer
  components:
  - type: Instrument
    program: 62
  - type: Sprite
    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
    state: icon
-
  - type: Item
    size: 24
    sprite: Objects/Fun/Instruments/h_synthesizer.rsi

-
 - type: entity
-  name: acoustic guitar
  parent: BaseHandheldInstrument
  id: AcousticGuitarInstrument
+  name: acoustic guitar
  components:
  - type: Instrument
    program: 25
  - type: Sprite
    sprite: Objects/Fun/Instruments/guitar.rsi
    state: icon
-
  - type: Item
    size: 24
    sprite: Objects/Fun/Instruments/guitar.rsi

 - type: entity
-  name: violin
  parent: BaseHandheldInstrument
  id: ViolinInstrument
+  name: violin
  components:
  - type: Instrument
    program: 40
@@ -60,9 +56,9 @@
    sprite: Objects/Fun/Instruments/violin.rsi

 - type: entity
-  name: trumpet
  parent: BaseHandheldInstrument
  id: TrumpetInstrument
+  name: trumpet
  components:
  - type: Instrument
    program: 56
@@ -74,130 +70,122 @@
    sprite: Objects/Fun/Instruments/trumpet.rsi

 - type: entity
-  name: electric guitar
  parent: BaseHandheldInstrument
  id: ElectricGuitarInstrument
+  name: electric guitar
  components:
  - type: Instrument
    program: 27
  - type: Sprite
    sprite: Objects/Fun/Instruments/eguitar.rsi
    state: icon
-
  - type: Item
    size: 24
    sprite: Objects/Fun/Instruments/eguitar.rsi

 - type: entity
-  name: accordion
  parent: BaseHandheldInstrument
  id: AccordionInstrument
+  name: accordion
  components:
  - type: Instrument
    program: 21
  - type: Sprite
    sprite: Objects/Fun/Instruments/accordion.rsi
    state: icon
-
  - type: Item
    size: 24
    sprite: Objects/Fun/Instruments/accordion.rsi

 - type: entity
-  name: harmonica
  parent: BaseHandheldInstrument
  id: HarmonicaInstrument
+  name: harmonica
  components:
  - type: Instrument
    program: 22
  - type: Sprite
    sprite: Objects/Fun/Instruments/harmonica.rsi
    state: icon
-
  - type: Item
    size: 10
    sprite: Objects/Fun/Instruments/harmonica.rsi

 - type: entity
-  name: recorder
  parent: BaseHandheldInstrument
  id: RecorderInstrument
+  name: recorder
  components:
  - type: Instrument
    program: 74
  - type: Sprite
    sprite: Objects/Fun/Instruments/recorder.rsi
    state: icon
-
  - type: Item
    size: 24
    sprite: Objects/Fun/Instruments/recorder.rsi

 - type: entity
-  name: trombone
  parent: BaseHandheldInstrument
  id: TromboneInstrument
+  name: trombone
  components:
  - type: Instrument
    program: 57
  - type: Sprite
    sprite: Objects/Fun/Instruments/trombone.rsi
    state: icon
-
  - type: Item
    size: 24
    sprite: Objects/Fun/Instruments/trombone.rsi

 - type: entity
-  name: saxophone
  parent: BaseHandheldInstrument
  id: SaxophoneInstrument
+  name: saxophone
  components:
  - type: Instrument
    program: 67
  - type: Sprite
    sprite: Objects/Fun/Instruments/saxophone.rsi
    state: icon
-
  - type: Item
    size: 24
    sprite: Objects/Fun/Instruments/saxophone.rsi

 - type: entity
-  name: glockenspiel
  parent: BaseHandheldInstrument
  id: GlockenspielInstrument
+  name: glockenspiel
  components:
  - type: Instrument
    program: 9
  - type: Sprite
    sprite: Objects/Fun/Instruments/glockenspiel.rsi
    state: icon
-
  - type: Item
    size: 24
    sprite: Objects/Fun/Instruments/glockenspiel.rsi

 - type: entity
-  name: banjo
  parent: BaseHandheldInstrument
  id: BanjoInstrument
+  name: banjo
  components:
  - type: Instrument
    program: 105
  - type: Sprite
    sprite: Objects/Fun/Instruments/banjo.rsi
    state: icon
-
  - type: Item
    size: 24
    sprite: Objects/Fun/Instruments/banjo.rsi

 - type: entity
-  name: gilded bike horn
-  description: An exquisitely decorated bike horn, capable of honking in a variety of notes.
  parent: BaseHandheldInstrument
  id: BikeHornInstrument
+  name: gilded bike horn
+  description: An exquisitely decorated bike horn, capable of honking in a variety of notes.
  components:
  - type: Instrument
    program: 1
@@ -208,31 +196,29 @@
  - type: Clothing
    size: 24
    sprite: Objects/Fun/Instruments/bike_horn.rsi
-    Slots:
-      - Belt
+    Slots: [Belt]
    QuickEquip: false

 - type: entity
-  name: super synthesizer
-  description: Blasting the ghetto with Touhou MIDIs since 2020.
  parent: BaseHandheldInstrument
  id: SuperSynthesizerInstrument
+  name: super synthesizer
+  description: Blasting the ghetto with Touhou MIDIs since 2020.
  components:
-    - type: Instrument
-      allowPercussion: true
-      allowProgramChange: true
-    - type: Sprite
-      sprite: Objects/Fun/Instruments/h_synthesizer.rsi
-      state: icon
-
-    - type: Item
-      size: 24
-      sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+  - type: Instrument
+    allowPercussion: true
+    allowProgramChange: true
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi

 - type: entity
-  name: xylophone
  parent: BaseHandheldInstrument
  id: XylophoneInstrument
+  name: xylophone
  description: Rainbow colored glockenspiel.
  components:
  - type: Instrument
--- a/Resources/Prototypes/Entities/Objects/Fun/skub.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
@@ -1,7 +1,7 @@
 - type: entity
-  name: skub
  parent: BaseItem
  id: Skub
+  name: skub
  description: Skub is the fifth Chaos God.
  components:
  - type: Sprite
@@ -13,6 +13,5 @@
  - type: LoopingSound
  - type: EmitSoundOnUse
    sound: /Audio/Items/skub.ogg
-
  - type: UseDelay
    delay: 2.0
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1,9 +1,9 @@
 ## Plushies

 - type: entity
-  name: bee plushie
  parent: BaseItem
  id: PlushieBee
+  name: bee plushie
  description: A cute toy that resembles an even cuter programmer.
  components:
  - type: Toys
@@ -16,9 +16,9 @@
    delay: 1.0

 - type: entity
-  name: nukie plushie
  parent: BaseItem
  id: PlushieNuke
+  name: nukie plushie
  description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious.
  components:
  - type: Toys
@@ -31,9 +31,9 @@
    delay: 1.0

 - type: entity
-  name: lizard plushie
  parent: BaseItem
  id: PlushieLizard
+  name: lizard plushie
  description: An adorable stuffed toy that resembles a lizardperson. Made by CentCom as a token initiative to combat speciesism in work environments. "Welcome your new colleges as you do this plush, with open arms!"
  components:
  - type: Toys
@@ -46,10 +46,10 @@
    delay: 1.0

 - type: entity
-  name: nar'sie plushie
  parent: BaseItem
  id: PlushieNar
-  description: A small stuffed doll of the elder goddess Nar'Sie. 
+  name: nar'sie plushie
+  description: A small stuffed doll of the elder goddess Nar'Sie.
  components:
  - type: Toys
  - type: LoopingSound
@@ -61,9 +61,9 @@
    delay: 1.0

 - type: entity
-  name: carp plushie
  parent: BaseItem
  id: PlushieCarp
+  name: carp plushie
  description: An adorable stuffed toy that resembles the monstrous space carp.
  components:
  - type: Toys
@@ -79,9 +79,9 @@
    delay: 1.0

 - type: entity
-  name: slime plushie
  parent: BaseItem
  id: PlushieSlime
+  name: slime plushie
  description: An adorable stuffed toy that resembles a slime. It's basically a hacky sack.
  components:
  - type: Toys
@@ -94,9 +94,9 @@
    delay: 1.0

 - type: entity
-  name: snake plushie
  parent: BaseItem
  id: PlushieSnake
+  name: snake plushie
  description: An adorable stuffed toy that resembles a snake.
  components:
  - type: Sprite
@@ -110,9 +110,9 @@
    delay: 1.0

 - type: entity
-  name: mouse toy
  parent: BaseItem
  id: ToyMouse
+  name: mouse toy
  description: A colorful toy mouse!
  components:
  - type: Sprite
@@ -125,10 +125,14 @@
  - type: UseDelay
    delay: 1.0

+# This stuff might be copyright claimed by From Software. The sprites are unique
+# and made by Bright but the sounds are ripped straight from the game. Idk, it's
+# probably not a big deal.
+
 - type: entity
-  name: help me carving
  parent: BaseItem
  id: CarvingHelpMe
+  name: help me carving
  description: Help me!
  components:
  - type: Sprite
@@ -145,12 +149,10 @@
  - type: UseDelay
    delay: 1.0

-# All using the same sprite until Bright gives me sprites the rest.
-
 - type: entity
-  name: hello carving
  parent: BaseItem
  id: CarvingHello
+  name: hello carving
  description: Hello!
  components:
  - type: Sprite
@@ -168,9 +170,9 @@
    delay: 1.0

 - type: entity
-  name: thank you carving
  parent: BaseItem
  id: CarvingThankYou
+  name: thank you carving
  description: Thank you!
  components:
  - type: Sprite
@@ -188,9 +190,9 @@
    delay: 1.0

 - type: entity
-  name: very good carving
  parent: BaseItem
  id: CarvingVeryGood
+  name: very good carving
  description: Very good!
  components:
  - type: Sprite
@@ -208,9 +210,9 @@
    delay: 1.0

 - type: entity
-  name: sorry carving
  parent: BaseItem
  id: CarvingImSorry
+  name: sorry carving
  description: I'm sorry.
  components:
  - type: Sprite
@@ -230,19 +232,19 @@
 ## Figurines

 - type: entity
-  name: AI toy
  parent: BaseItem
  id: ToyAi
-  description: A scaled-down toy AI core. 
+  name: AI toy
+  description: A scaled-down toy AI core.
  components:
  - type: Sprite
    sprite: Objects/Fun/toys.rsi
    state: AI

 - type: entity
-  name: nuke toy
  parent: BaseItem
  id: ToyNuke
+  name: nuke toy
  description: A plastic model of a Nuclear Fission Explosive. No uranium included... probably.
  components:
  - type: Sprite
@@ -250,9 +252,9 @@
    state: nuketoy

 - type: entity
-  name: assistant toy
  parent: BaseItem
  id: ToyAssistant
+  name: assistant toy
  description: Grey tide world wide!
  components:
  - type: Sprite
@@ -263,9 +265,9 @@
    HeldPrefix: doll

 - type: entity
-  name: griffin toy
  parent: BaseItem
  id: ToyGriffin
+  name: griffin toy
  description: An action figure modeled after 'The Griffin', criminal mastermind.
  components:
  - type: Sprite
@@ -273,9 +275,9 @@
    state: griffinprize

 - type: entity
-  name: h.o.n.k. toy
  parent: BaseItem
  id: ToyHonk
+  name: h.o.n.k. toy
  description: Mini-Mecha action figure! 'Mecha No. 6/12' is written on the back.
  components:
  - type: Sprite
@@ -283,9 +285,9 @@
    state: honkprize

 - type: entity
-  name: ian toy
  parent: BaseItem
  id: ToyIan
+  name: ian toy
  description: Unable to eat, but just as fluffy as the real guy!
  components:
  - type: Sprite
@@ -299,9 +301,9 @@
    delay: 1.0

 - type: entity
-  name: marauder toy
  parent: BaseItem
  id: ToyMarauder
+  name: marauder toy
  description: Mini-Mecha action figure! 'Mecha No. 7/12' is written on the back.
  components:
  - type: Sprite
@@ -309,9 +311,9 @@
    state: marauderprize

 - type: entity
-  name: mauler toy
  parent: BaseItem
  id: ToyMauler
+  name: mauler toy
  description: Mini-Mecha action figure! 'Mecha No. 9/12' is written on the back.
  components:
  - type: Sprite
@@ -319,9 +321,9 @@
    state: maulerprize

 - type: entity
-  name: gygax toy
  parent: BaseItem
  id: ToyGygax
+  name: gygax toy
  description: Mini-Mecha action figure! 'Mecha No. 4/12' is written on the back.
  components:
  - type: Sprite
@@ -329,9 +331,9 @@
    state: gygaxtoy

 - type: entity
-  name: odysseus toy
  parent: BaseItem
  id: ToyOdysseus
+  name: odysseus toy
  description: Mini-Mecha action figure! 'Mecha No. 10/12' is written on the back.
  components:
  - type: Sprite
@@ -339,9 +341,9 @@
    state: odysseusprize

 - type: entity
-  name: owl toy
  parent: BaseItem
  id: ToyOwlman
+  name: owl toy
  description: An action figure modeled after 'The Owl', defender of justice.
  components:
  - type: Sprite
@@ -349,9 +351,9 @@
    state: owlprize

 - type: entity
-  name: deathripley toy
  parent: BaseItem
  id: ToyDeathRipley
+  name: deathripley toy
  description: Mini-Mecha action figure! 'Mecha No. 3/12' is written on the back.
  components:
  - type: Sprite
@@ -359,9 +361,9 @@
    state: deathripleytoy

 - type: entity
-  name: phazon toy
  parent: BaseItem
  id: ToyPhazon
+  name: phazon toy
  description: Mini-Mecha action figure! 'Mecha No. 11/12' is written on the back.
  components:
  - type: Sprite
@@ -369,9 +371,9 @@
    state: phazonprize

 - type: entity
-  name: fire ripley
  parent: BaseItem
  id: ToyFireRipley
+  name: fire ripley
  description: Mini-Mecha action figure! 'Mecha No. 2/12' is written on the back.
  components:
  - type: Sprite
@@ -379,9 +381,9 @@
    state: fireripleytoy

 - type: entity
-  name: reticence toy
  parent: BaseItem
  id: ToyReticence
+  name: reticence toy
  description: Mini-Mecha action figure! 'Mecha No. 12/12' is written on the back.
  components:
  - type: Sprite
@@ -389,9 +391,9 @@
    state: reticenceprize

 - type: entity
-  name: ripley toy
  parent: BaseItem
  id: ToyRipley
+  name: ripley toy
  description: Mini-Mecha action figure! 'Mecha No. 1/12' is written on the back.
  components:
  - type: Sprite
@@ -400,9 +402,9 @@


 - type: entity
-  name: seraph toy
  parent: BaseItem
  id: ToySeraph
+  name: seraph toy
  description: Mini-Mecha action figure! 'Mecha No. 8/12' is written on the back.
  components:
  - type: Sprite
@@ -411,9 +413,9 @@


 - type: entity
-  name: durand toy
  parent: BaseItem
  id: ToyDurand
+  name: durand toy
  description: Mini-Mecha action figure! 'Mecha No. 5/12' is written on the back.
  components:
  - type: Sprite
@@ -422,43 +424,40 @@


 ### Yeah I left these all mixed up for a future coder to puzzle over, it's lore.
+### Help i'm sorting these and my previous self let this message here to taunt me aaaaa

 - type: entity
-  name: skeleton toy
  parent: BaseItem
  id: ToySkeleton
+  name: skeleton toy
  description: Spooked ya!
  components:
  - type: Sprite
    sprite: Objects/Fun/toys.rsi
    state: skeletonprize

-
 ## Toyweapons

 - type: entity
-  name: foam weapon base
+  abstract: true
  parent: BaseItem
  id: FoamWeaponBase
-  abstract: true
  components:
  - type: Sprite
    netsync: false
-
  - type: Item
    size: 24
    state: icon

 - type: entity
-  name: foam crossbow
  parent: FoamWeaponBase
  id: FoamCrossbow
+  name: foam crossbow
  description: Aiming this at Security may get you filled with lead.
  components:
  - type: Sprite
    sprite: Objects/Fun/toys.rsi
    state: foamcrossbow
-
  - type: Item
    size: 24
    sprite: Objects/Fun/toys.rsi
@@ -476,9 +475,9 @@
    soundInsert: /Audio/Weapons/Guns/MagIn/drawbow2.ogg

 - type: entity
-  name: ToyGunBase
  parent: BaseItem
  id: ToyGunBase
+  name: ToyGunBase
  description: A rooty tooty point and shooty.
  abstract: true
  components:
@@ -486,9 +485,9 @@
    netsync: false

 - type: entity
-  name: cap gun
  parent: ToyGunBase
  id: RevolverCapGun
+  name: cap gun
  description: Looks almost like the real thing! Ages 8 and up.
  components:
  - type: Sprite
@@ -498,7 +497,6 @@
      map: ["enum.RangedBarrelVisualLayers.Base"]
    - state: bolt-closed
      map: ["enum.RangedBarrelVisualLayers.Bolt"]
-
  - type: Item
    size: 24
    sprite: Objects/Fun/toys.rsi
@@ -519,9 +517,9 @@
    - type: BarrelBoltVisualizer

 - type: entity
-  name: foamblade
  parent: BaseItem
  id: FoamBlade
+  name: foamblade
  description: It says "Sternside Changs number 1 fan" on it.
  components:
  - type: Sprite
@@ -549,72 +547,67 @@
 # MISC

 - type: entity
-  name: basketball
  parent: BaseItem
  id: Basketball
+  name: basketball
  description: Where dah courts at?
  components:
  - type: Sprite
    sprite: Objects/Fun/toys.rsi
    state: basketball
-
  - type: Item
    size: 24
    sprite: Objects/Fun/toys.rsi
    HeldPrefix: bask

 - type: entity
-  name: football
  parent: BaseItem
  id: Football
+  name: football
  description: Otherwise known as a handegg.
  components:
  - type: Sprite
    sprite: Objects/Fun/toys.rsi
    state: football
-
  - type: Item
    size: 12
    sprite: Objects/Fun/toys.rsi
    HeldPrefix: footb

-
 - type: entity
-  name: syndie balloon
  parent: BaseItem
  id: BalloonSyn
+  name: syndie balloon
  description: Handed out to the bravest souls who survived the "atomic twister" ride at Syndieland.
  components:
  - type: Sprite
    sprite: Objects/Fun/toys.rsi
    state: synb
-
  - type: Item
    size: 24
    sprite: Objects/Fun/toys.rsi
    HeldPrefix: synb

 - type: entity
-  name: corgi balloon
  parent: BaseItem
  id: BalloonCorgi
+  name: corgi balloon
  description: Just like owning a real dog - but a lot floatier.
  components:
  - type: Sprite
    sprite: Objects/Fun/toys.rsi
    state: corgib
-
  - type: Item
    size: 24
    sprite: Objects/Fun/toys.rsi
    HeldPrefix: corgib

 - type: entity
-  name: singuloth-brand toy
  parent: BaseItem
  id: SingularityToy
+  name: singuloth-brand toy
  description: Mass-produced by a sadistic corporate conglomerate!
-  components:  
+  components:
  - type: Sprite
    sprite: Objects/Fun/toys.rsi
    state: singularitytoy
@@ -622,8 +615,7 @@
    sprite: Objects/Fun/toys.rsi
    state: singularitytoy
  - type: ToySingularity
-  
  - type: Item
    size: 12
    sprite: Objects/Fun/toys.rsi
-    HeldPrefix: singularitytoy
+    HeldPrefix: singularitytoy
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -1,231 +1,231 @@
 - type: entity
-  id: SheetGlassBase
  abstract: true
  parent: BaseItem
+  id: SheetGlassBase
  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: 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
+  id: SheetGlass
+  name: glass
  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: FloorTile
-      outputs:
-        - floor_glass
-    - type: Construction
-      graph: glass
-      node: SheetGlass
+  - 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: FloorTile
+    outputs:
+    - floor_glass
+  - type: Construction
+    graph: glass
+    node: SheetGlass

 - type: entity
+  parent: SheetGlass
  id: SheetGlass1
  name: glass
-  parent: SheetGlass
  components:
-    - type: Sprite
-      state: glass
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: glass
+  - type: Stack
+    count: 1

 - type: entity
-  name: reinforced glass
-  id: SheetRGlass
  parent: SheetGlassBase
+  id: SheetRGlass
+  name: reinforced glass
  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: FloorTile
-      outputs:
-        - floor_rglass
-    - type: Construction
-      graph: glass
-      node: SheetRGlass
+  - 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: FloorTile
+    outputs:
+    - floor_rglass
+  - type: Construction
+    graph: glass
+    node: SheetRGlass

 - type: entity
+  parent: SheetRGlass
  id: SheetRGlass1
  name: reinforced glass
-  parent: SheetRGlass
  components:
-    - type: Sprite
-      state: rglass
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: rglass
+  - type: Stack
+    count: 1

 - type: entity
-  name: plasma glass
-  id: SheetPGlass
  parent: SheetGlassBase
+  id: SheetPGlass
+  name: plasma glass
  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: Construction
-      graph: glass
-      node: SheetPGlass
+  - 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: Construction
+    graph: glass
+    node: SheetPGlass

 - type: entity
+  parent: SheetPGlass
  id: SheetPGlass1
  name: plasma glass
-  parent: SheetPGlass
  components:
-    - type: Sprite
-      state: pglass
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: pglass
+  - type: Stack
+    count: 1

 - type: entity
-  name: reinforced plasma glass
-  id: SheetRPGlass
  parent: SheetGlassBase
+  id: SheetRPGlass
+  name: reinforced plasma glass
  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: Construction
-      graph: glass
-      node: SheetRPGlass
+  - 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: Construction
+    graph: glass
+    node: SheetRPGlass

 - type: entity
+  parent: SheetPGlass
  id: SheetRPGlass1
  name: reinforced plasma glass
-  parent: SheetPGlass
  components:
-    - type: Sprite
-      state: rpglass
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: rpglass
+  - type: Stack
+    count: 1

 - type: entity
-  name: titanium glass
-  id: SheetTitaniumGlass
  parent: SheetGlassBase
+  id: SheetTitaniumGlass
+  name: titanium glass
  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: 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
+  parent: SheetTitaniumGlass
  id: SheetTitaniumGlass1
  name: titanium glass
-  parent: SheetTitaniumGlass
  components:
-    - type: Sprite
-      state: titaniumglass
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: titaniumglass
+  - type: Stack
+    count: 1

 - type: entity
-  name: plastitanium glass
-  id: SheetPlastitaniumGlass
  parent: SheetGlassBase
+  id: SheetPlastitaniumGlass
+  name: plastitanium glass
  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: 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
+  parent: SheetPlastitaniumGlass
  id: SheetPlastitaniumGlass1
  name: plastitanium glass
-  parent: SheetPlastitaniumGlass
  components:
-    - type: Sprite
-      state: plastitaniumglass
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: plastitaniumglass
+  - type: Stack
+    count: 1
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -1,183 +1,183 @@
 - type: entity
-  id: SheetMetalBase
  abstract: true
  parent: BaseItem
+  id: SheetMetalBase
  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: 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
+  id: SheetSteel
+  name: steel
  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: FloorTile
-      outputs:
-        - underplating
-        
+  - 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: FloorTile
+    outputs:
+    - underplating
+
 - type: entity
+  parent: SheetSteel
  id: SheetSteel1
  name: steel
-  parent: SheetSteel
  components:
-    - type: Sprite
-      state: steel
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: steel
+  - type: Stack
+    count: 1

 - type: entity
-  name: plasteel
-  id: SheetPlasteel
  parent: SheetMetalBase
+  id: SheetPlasteel
+  name: plasteel
  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: 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
+  parent: SheetPlasteel
  id: SheetPlasteel1
  name: plasteel
-  parent: SheetPlasteel
  components:
-    - type: Sprite
-      state: plasteel
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: plasteel
+  - type: Stack
+    count: 1

 - type: entity
-  name: titanium
-  id: SheetTitanium
  parent: SheetMetalBase
+  id: SheetTitanium
+  name: titanium
  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: 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
+  parent: SheetTitanium
  id: SheetTitanium1
  name: titanium
-  parent: SheetTitanium
  components:
-    - type: Sprite
-      state: titanium
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: titanium
+  - type: Stack
+    count: 1

 - type: entity
-  name: plastitanium
-  id: SheetPlastitanium
  parent: SheetMetalBase
+  id: SheetPlastitanium
+  name: plastitanium
  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: 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
+  parent: SheetPlastitanium
  id: SheetPlastitanium1
  name: plastitanium
-  parent: SheetPlastitanium
  components:
-    - type: Sprite
-      state: plastitanium
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: plastitanium
+  - type: Stack
+    count: 1

 - type: entity
-  name: brass
-  id: SheetBrass
  parent: SheetMetalBase
+  id: SheetBrass
+  name: brass
  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: 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
+  parent: SheetBrass
  id: SheetBrass1
  name: brass
-  parent: SheetBrass
  components:
-    - type: Sprite
-      state: brass
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: brass
+  - type: Stack
+    count: 1
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -1,156 +1,156 @@
 - type: entity
-  id: SheetOtherBase
  abstract: true
  parent: BaseItem
+  id: SheetOtherBase
  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: 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
+  id: SheetPaper
+  name: paper
  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: 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
+  parent: SheetPaper
  id: SheetPaper1
  name: paper
-  parent: SheetPaper
  components:
-    - type: Sprite
-      state: paper
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: paper
+  - type: Stack
+    count: 1

 - type: entity
-  name: phoron
-  id: SheetPhoron
  parent: SheetOtherBase
+  id: SheetPhoron
+  name: phoron
  components:
-    - type: Material
-      materials:
-        - key: enum.MaterialKeys.Stack
-          mat: phoron
-    - type: Stack
-      stackType: Phoron
-    - type: Sprite
-      state: phoron
-    - type: Item
-      HeldPrefix: phoron
+  - type: Material
+    materials:
+    - key: enum.MaterialKeys.Stack
+      mat: phoron
+  - type: Stack
+    stackType: Phoron
+  - type: Sprite
+    state: phoron
+  - type: Item
+    HeldPrefix: phoron

 - type: entity
+  parent: SheetPhoron
  id: SheetPhoron1
  name: phoron
-  parent: SheetPhoron
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: plasma
-  id: SheetPlasma
  parent: SheetOtherBase
+  id: SheetPlasma
+  name: plasma
  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: 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
+  parent: SheetPlasma
  id: SheetPlasma1
  name: plasma
-  parent: SheetPlasma
  components:
-    - type: Sprite
-      state: plasma
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: plasma
+  - type: Stack
+    count: 1

 - type: entity
-  name: plastic
-  id: SheetPlastic
  parent: SheetOtherBase
+  id: SheetPlastic
+  name: plastic
  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: 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
+  parent: SheetPlastic
  id: SheetPlastic1
  name: plastic
-  parent: SheetPlastic
  components:
-    - type: Sprite
-      state: plastic
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: plastic
+  - type: Stack
+    count: 1

 - type: entity
-  name: uranium
-  id: SheetUranium
  parent: SheetOtherBase
+  id: SheetUranium
+  name: uranium
  components:
-    - type: Stack
-      stackType: Uranium
-    - type: Sprite
-      state: uranium
-    - type: Item
-      HeldPrefix: uranium
+  - type: Stack
+    stackType: Uranium
+  - type: Sprite
+    state: uranium
+  - type: Item
+    HeldPrefix: uranium

 - type: entity
+  parent: SheetUranium
  id: SheetUranium1
  name: uranium
-  parent: SheetUranium
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1
--- a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
@@ -1,213 +1,213 @@
 - type: entity
-  id: IngotBase
  abstract: true
  parent: BaseItem
+  id: IngotBase
  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: 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
+  id: IngotAdamantine
+  name: adamantine bar
  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: 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
+  parent: IngotAdamantine
  id: IngotAdamantine1
  name: adamantine bar
-  parent: IngotAdamantine
  components:
-    - type: Sprite
-      state: adamantine
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: adamantine
+  - type: Stack
+    count: 1

 - type: entity
-  name: copper bar
-  id: IngotCopper
  parent: IngotBase
+  id: IngotCopper
+  name: copper bar
  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: 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
+  parent: IngotCopper
  id: IngotCopper1
  name: copper bar
-  parent: IngotCopper
  components:
-    - type: Sprite
-      state: copper
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: copper
+  - type: Stack
+    count: 1

 - type: entity
-  name: gold bar
-  id: IngotGold
  parent: IngotBase
+  id: IngotGold
+  name: gold bar
  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: 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
+  parent: IngotGold
  id: IngotGold1
  name: gold bar
-  parent: IngotGold
  components:
-    - type: Sprite
-      state: gold
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: gold
+  - type: Stack
+    count: 1

 - type: entity
-  name: hydrogen bar
-  id: IngotHydrogen
  parent: IngotBase
+  id: IngotHydrogen
+  name: hydrogen bar
  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: 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
+  parent: IngotHydrogen
  id: IngotHydrogen1
  name: hydrogen bar
-  parent: IngotHydrogen
  components:
-    - type: Sprite
-      state: hydrogen
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: hydrogen
+  - type: Stack
+    count: 1

 - type: entity
-  name: iron bar
-  id: IngotIron
  parent: IngotBase
+  id: IngotIron
+  name: iron bar
  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: 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
+  parent: IngotIron
  id: IngotIron1
  name: iron bar
-  parent: IngotIron
  components:
-    - type: Sprite
-      state: iron
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: iron
+  - type: Stack
+    count: 1

 - type: entity
-  name: silver bar
-  id: IngotSilver
  parent: IngotBase
+  id: IngotSilver
+  name: silver bar
  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: 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
+  parent: IngotSilver
  id: IngotSilver1
  name: silver bar
-  parent: IngotSilver
  components:
-    - type: Sprite
-      state: silver
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: silver
+  - type: Stack
+    count: 1
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -1,277 +1,277 @@
 - type: entity
-  id: MaterialBase
  abstract: true
  parent: BaseItem
+  id: MaterialBase
  description: A raw material.
  components:
-    - type: Sprite
-      netsync: false
-      sprite: Objects/Materials/materials.rsi
-    - type: Item
-      sprite: Objects/Materials/materials.rsi
-    - type: ItemStatus
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Materials/materials.rsi
+  - type: Item
+    sprite: Objects/Materials/materials.rsi
+  - type: ItemStatus

 - type: entity
-  name: bananium
+  parent: MaterialBase
  id: MaterialBananium
-  parent: MaterialBase
+  name: bananium
  components:
-    - type: Stack
-      stackType: Bananium
-    - type: Sprite
-      state: bananium
+  - type: Stack
+    stackType: Bananium
+  - type: Sprite
+    state: bananium

 - type: entity
-  id: MaterialBananium1
  parent: MaterialBananium
+  id: MaterialBananium1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: cloth
+  parent: MaterialBase
  id: MaterialCloth
-  parent: MaterialBase
+  name: cloth
  components:
-    - type: Stack
-      stackType: Cloth
-    - type: Sprite
-      state: cloth_3
-    - type: Appearance
-      visuals:
-        - type: StackVisualizer
-          stackLayers:
-            - cloth
-            - cloth_2
-            - cloth_3
+  - 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
+  id: MaterialCloth1
  components:
-    - type: Sprite
-      state: cloth
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: cloth
+  - type: Stack
+    count: 1

 - type: entity
-  name: cotton
+  parent: MaterialBase
  id: MaterialCotton
-  parent: MaterialBase
+  name: cotton
  components:
-    - type: Stack
-      stackType: Cotton
-    - type: Sprite
-      state: cotton_3
-    - type: Appearance
-      visuals:
-        - type: StackVisualizer
-          stackLayers:
-            - cotton
-            - cotton_2
-            - cotton_3
+  - 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
+  id: MaterialCotton1
  components:
-    - type: Sprite
-      state: cotton
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: cotton
+  - type: Stack
+    count: 1

 - type: entity
-  name: refined diamond
+  parent: MaterialBase
  id: MaterialDiamond
-  parent: MaterialBase
+  name: refined diamond
  components:
-    - type: Stack
-      stackType: Diamond
-    - type: Sprite
-      state: diamond
-    - type: Item
-      HeldPrefix: diamond
+  - type: Stack
+    stackType: Diamond
+  - type: Sprite
+    state: diamond
+  - type: Item
+    HeldPrefix: diamond

 - type: entity
-  id: MaterialDiamond1
  parent: MaterialDiamond
+  id: MaterialDiamond1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: durathread
+  parent: MaterialBase
  id: MaterialDurathread
-  parent: MaterialBase
+  name: durathread
  components:
-    - type: Stack
-      stackType: Durathread
-    - type: Sprite
-      state: durathread_3
-    - type: Appearance
-      visuals:
-        - type: StackVisualizer
-          stackLayers:
-            - durathread
-            - durathread_2
-            - durathread_3
+  - 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
+  id: MaterialDurathread1
  components:
-    - type: Sprite
-      state: durathread
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: durathread
+  - type: Stack
+    count: 1

 - type: entity
-  name: raw durathread
+  parent: MaterialBase
  id: MaterialDurathreadRaw
-  parent: MaterialBase
+  name: raw durathread
  components:
-    - type: Stack
-      stackType: RawDurathread
-    - type: Sprite
-      state: durathreadraw_3
-    - type: Appearance
-      visuals:
-        - type: StackVisualizer
-          stackLayers:
-            - durathreadraw
-            - durathreadraw_2
-            - durathreadraw_3
+  - 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
+  id: MaterialDurathreadRaw1
  components:
-    - type: Sprite
-      state: durathreadraw
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: durathreadraw
+  - type: Stack
+    count: 1

 - type: entity
-  name: hide
+  parent: MaterialBase
  id: MaterialHide
-  parent: MaterialBase
+  name: hide
  components:
-    - type: Stack
-      stackType: Hide
-    - type: Sprite
-      state: hide_3
-    - type: Appearance
-      visuals:
-        - type: StackVisualizer
-          stackLayers:
-            - hide
-            - hide_2
-            - hide_3
+  - 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
+  id: MaterialHide1
  components:
-    - type: Sprite
-      state: hide
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: hide
+  - type: Stack
+    count: 1

 - type: entity
-  name: leather
+  parent: MaterialBase
  id: MaterialLeather
-  parent: MaterialBase
+  name: leather
  components:
-    - type: Stack
-      stackType: Leather
-    - type: Sprite
-      state: leather_3
-    - type: Appearance
-      visuals:
-        - type: StackVisualizer
-          stackLayers:
-            - leather
-            - leather_2
-            - leather_3
+  - 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
+  id: MaterialLeather1
  components:
-    - type: Sprite
-      state: leather
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: leather
+  - type: Stack
+    count: 1

 - type: entity
-  name: wood
-  id: MaterialWoodPlank
  parent: MaterialBase
+  id: MaterialWoodPlank
+  name: wood
  components:
-    - type: Material
-      materials:
-        - key: enum.MaterialKeys.Stack
-          mat: wood
-    - type: Stack
-      stackType: WoodPlank
-    - type: Sprite
-      state: wood
-    - type: Item
-      HeldPrefix: wood
+  - 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
+  id: MaterialWoodPlank1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 # Specific Hides

 - type: entity
-  name: bear hide
+  parent: MaterialBase
  id: MaterialHideBear
-  parent: MaterialBase
+  name: bear hide
  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: 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
+  parent: MaterialBase
  id: MaterialHideCat
-  parent: MaterialBase
+  name: cat hide
  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: 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
+  id: MaterialHideCorgi
+  name: corgi hid
  components:
-    - type: Sprite
-      sprite: Objects/Materials/materials.rsi
-      state: corgihide
-    - type: Clothing
-      sprite: Clothing/Head/Misc/hides.rsi
-    #   HeldPrefix: corgi
-      ClothingPrefix: corgi2
-      Slots:
-      - Helmet
+  - type: Sprite
+    sprite: Objects/Materials/materials.rsi
+    state: corgihide
+  - type: Clothing
+    sprite: Clothing/Head/Misc/hides.rsi
+  #   HeldPrefix: corgi
+    ClothingPrefix: corgi2
+    Slots:
+    - Helmet
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -1,118 +1,118 @@
 - type: entity
-  id: OreBase
  abstract: true
  parent: BaseItem
+  id: OreBase
  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: 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
+  parent: OreBase
  id: AdamantineOre
-  parent: OreBase
+  name: adamantine ore
  components:
-    - type: Stack
-      stackType: AdamantineOre
-    - type: Sprite
-      state: adamantine
+  - type: Stack
+    stackType: AdamantineOre
+  - type: Sprite
+    state: adamantine

 - type: entity
-  id: AdamantineOre1
  parent: AdamantineOre
+  id: AdamantineOre1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: ammonia
+  parent: OreBase
  id: Ammonia
-  parent: OreBase
+  name: ammonia
  components:
-    - type: Stack
-      stackType: Ammonia
-    - type: Sprite
-      state: ammonia
+  - type: Stack
+    stackType: Ammonia
+  - type: Sprite
+    state: ammonia

 - type: entity
-  id: Ammonia1
  parent: Ammonia
+  id: Ammonia1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: bananium ore
+  parent: OreBase
  id: BananiumOre
-  parent: OreBase
+  name: bananium ore
  components:
-    - type: Stack
-      stackType: BananiumOre
-    - type: Sprite
-      state: bananium
+  - type: Stack
+    stackType: BananiumOre
+  - type: Sprite
+    state: bananium

 - type: entity
-  id: BananiumOre1
  parent: BananiumOre
+  id: BananiumOre1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: raw diamond
+  parent: OreBase
  id: DiamondRaw
-  parent: OreBase
+  name: raw diamond
  components:
-    - type: Stack
-      stackType: DiamondOre
-    - type: Sprite
-      state: diamond
+  - type: Stack
+    stackType: DiamondOre
+  - type: Sprite
+    state: diamond

 - type: entity
-  id: DiamondRaw1
  parent: DiamondRaw
+  id: DiamondRaw1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: gold ore
+  parent: OreBase
  id: GoldOre
-  parent: OreBase
+  name: gold ore
  components:
-    - type: Stack
-      stackType: GoldOre
-    - type: Sprite
-      state: gold
+  - type: Stack
+    stackType: GoldOre
+  - type: Sprite
+    state: gold

 - type: entity
-  id: GoldOre1
  parent: GoldOre
+  id: GoldOre1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: iron ore
-  id: IronOre
  parent: OreBase
+  id: IronOre
+  name: iron ore
  components:
-    - type: Stack
-      stackType: IronOre
-    - type: Sprite
-      state: iron
+  - type: Stack
+    stackType: IronOre
+  - type: Sprite
+    state: iron

 - type: entity
  id: IronOre1
@@ -123,145 +123,145 @@
      count: 1

 - type: entity
-  name: phoron ore
+  parent: OreBase
  id: PhoronOre
-  parent: OreBase
+  name: phoron ore
  components:
-    - type: Stack
-      stackType: PhoronOre
-    - type: Sprite
-      state: phoron
+  - type: Stack
+    stackType: PhoronOre
+  - type: Sprite
+    state: phoron

 - type: entity
-  id: PhoronOre1
  parent: PhoronOre
+  id: PhoronOre1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: plasma ore
+  parent: OreBase
  id: PlasmaOre
-  parent: OreBase
+  name: plasma ore
  components:
-    - type: Stack
-      stackType: PlasmaOre
-    - type: Sprite
-      state: plasma
+  - type: Stack
+    stackType: PlasmaOre
+  - type: Sprite
+    state: plasma

 - type: entity
-  id: PlasmaOre1
  parent: PlasmaOre
+  id: PlasmaOre1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: sand
+  parent: OreBase
  id: Sand
-  parent: OreBase
+  name: sand
  components:
-    - type: Stack
-      stackType: Sand
-    - type: Sprite
-      state: sand
+  - type: Stack
+    stackType: Sand
+  - type: Sprite
+    state: sand

 - type: entity
-  id: Sand1
  parent: Sand
+  id: Sand1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: black sand
+  parent: OreBase
  id: SandBlack
-  parent: OreBase
+  name: black sand
  components:
-    - type: Stack
-      stackType: BlackSand
-    - type: Sprite
-      state: sand_black
+  - type: Stack
+    stackType: BlackSand
+  - type: Sprite
+    state: sand_black

 - type: entity
-  id: SandBlack1
  parent: SandBlack
+  id: SandBlack1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: silver ore
+  parent: OreBase
  id: SilverOre
-  parent: OreBase
+  name: silver ore
  components:
-    - type: Stack
-      stackType: SilverOre
-    - type: Sprite
-      state: silver
+  - type: Stack
+    stackType: SilverOre
+  - type: Sprite
+    state: silver

 - type: entity
-  id: SilverOre1
  parent: SilverOre
+  id: SilverOre1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: slag
+  parent: OreBase
  id: Slag
-  parent: OreBase
+  name: slag
  components:
-    - type: Stack
-      stackType: Slag
-    - type: Sprite
-      state: slag
+  - type: Stack
+    stackType: Slag
+  - type: Sprite
+    state: slag

 - type: entity
-  id: Slag1
  parent: Slag
+  id: Slag1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: titanium ore
+  parent: OreBase
  id: TitaniumOre
-  parent: OreBase
+  name: titanium ore
  components:
-    - type: Stack
-      stackType: TitaniumOre
-    - type: Sprite
-      state: titanium
+  - type: Stack
+    stackType: TitaniumOre
+  - type: Sprite
+    state: titanium

 - type: entity
-  id: TitaniumOre1
  parent: TitaniumOre
+  id: TitaniumOre1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1

 - type: entity
-  name: uranium ore
-  id: UraniumOre
  parent: OreBase
+  id: UraniumOre
+  name: uranium ore
  components:
-    - type: Stack
-      stackType: UraniumOre
-    - type: Sprite
-      state: uranium
+  - type: Stack
+    stackType: UraniumOre
+  - type: Sprite
+    state: uranium

 - type: entity
-  id: UraniumOre1
  parent: UraniumOre
+  id: UraniumOre1
  suffix: 1
  components:
-    - type: Stack
-      count: 1
+  - type: Stack
+    count: 1
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -1,51 +1,50 @@
 - type: entity
-  id: PartBase
  abstract: true
  parent: BaseItem
-  description:
+  id: PartBase
  components:
-    - type: Sprite
-      netsync: false
-      sprite: Objects/Materials/parts.rsi
-      state: rods
-    - type: Item
-      sprite: Objects/Materials/parts.rsi
-    - type: ItemStatus
+  - 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
+  id: PartRodMetal
+  name: metals rods
  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: FloorTile
-      outputs:
-        - lattice
-        - floor_reinforced
-        
+  - 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: FloorTile
+    outputs:
+    - lattice
+    - floor_reinforced
+
 - type: entity
+  parent: PartRodMetal
  id: PartRodMetal1
  name: metal rod
-  parent: PartRodMetal
  components:
-    - type: Sprite
-      state: rods
-    - type: Stack
-      count: 1
+  - type: Sprite
+    state: rods
+  - type: Stack
+    count: 1
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -1,18 +1,17 @@
 - type: entity
-  id: ShardBase
-  name: shard
-  description: It's a shard of some unknown material.
-  parent: BaseItem
  abstract: true
+  parent: BaseItem
+  id: ShardBase
+  description: It's a shard of some unknown material.
  components:
  - type: Sprite
    sprite: Objects/Materials/Shards/shard.rsi
    state: shard1
  - type: RandomSpriteState
    spriteStates:
-      - shard1
-      - shard2
-      - shard3
+    - shard1
+    - shard2
+    - shard3
  - type: ItemCooldown
  - type: MeleeWeapon
    damageType: Slash
@@ -23,49 +22,49 @@
    damageType: Slash

 - type: entity
+  parent: ShardBase
  id: ShardGlass
  name: glass shard
  description: A small piece of glass. It looks sharp, you wouldn't want to step on it barefoot.
-  parent: ShardBase
  components:
-    - type: Sprite
-      color: "#bbeeff"
-    - type: Item
-      color: "#bbeeff"
-    - type: WelderRefinable
-      refineResult:
-      - SheetGlass
+  - type: Sprite
+    color: "#bbeeff"
+  - type: Item
+    color: "#bbeeff"
+  - type: WelderRefinable
+    refineResult:
+    - SheetGlass

 - type: entity
+  parent: ShardBase
  id: ShardGlassReinforced
  name: reinforced glass shard
  description: A small piece of reinforced glass. It looks sharp, you wouldn't want to step on it barefoot.
-  parent: ShardBase
  components:
-    - type: Sprite
-      color: "#96cdef"
-    - type: Item
-      color: "#96cdef"
-    - type: WelderRefinable
-      refineResult:
-      - SheetGlass
-      - SheetSteel
-    - type: DamageOtherOnHit
-      amount: 10
+  - type: Sprite
+    color: "#96cdef"
+  - type: Item
+    color: "#96cdef"
+  - type: WelderRefinable
+    refineResult:
+    - SheetGlass
+    - SheetSteel
+  - type: DamageOtherOnHit
+    amount: 10

 - type: entity
+  parent: ShardBase
  id: ShardGlassPlasma
  name: plasma glass shard
  description: A small piece of plasma glass. It looks sharp, you wouldn't want to step on it barefoot.
-  parent: ShardBase
  components:
-    - type: Sprite
-      color: "#f3b489"
-    - type: Item
-      color: "#f3b489"
-    - type: WelderRefinable
-      refineResult:
-      - SheetGlass
-      - SheetPlasma
-    - type: DamageOtherOnHit
-      amount: 15
+  - type: Sprite
+    color: "#f3b489"
+  - type: Item
+    color: "#f3b489"
+  - type: WelderRefinable
+    refineResult:
+    - SheetGlass
+    - SheetPlasma
+  - type: DamageOtherOnHit
+    amount: 15