Some YAML cleanup (#840)

Content.Client/GameObjects/Components/InteractionOutlineComponent.cs

@@ -9,8 +9,8 @@ namespace Content.Client.GameObjects.Components
     [RegisterComponent]
     public class InteractionOutlineComponent : Component
     {
-        private const string ShaderInRange = "selection_outline_inrange";
+        private const string ShaderInRange = "SelectionOutlineInrange";
-        private const string ShaderOutOfRange = "selection_outline";
+        private const string ShaderOutOfRange = "SelectionOutline";
 
         public override string Name => "InteractionOutline";
 

Content.Client/Graphics/Overlays/CircleMaskOverlay.cs

@@ -20,7 +20,7 @@ namespace Content.Client.Graphics.Overlays
         public CircleMaskOverlay() : base(nameof(CircleMaskOverlay))
         {
             IoCManager.InjectDependencies(this);
-            Shader = _prototypeManager.Index<ShaderPrototype>("circlemask").Instance();
+            Shader = _prototypeManager.Index<ShaderPrototype>("CircleMask").Instance();
         }
 
         protected override void Draw(DrawingHandleBase handle)

Content.Client/Graphics/Overlays/GradientCircleMask.cs

@@ -19,7 +19,7 @@ namespace Content.Client.Graphics.Overlays
         public GradientCircleMask() : base(nameof(GradientCircleMask))
         {
             IoCManager.InjectDependencies(this);
-            Shader = _prototypeManager.Index<ShaderPrototype>("gradientcirclemask").Instance();
+            Shader = _prototypeManager.Index<ShaderPrototype>("GradientCircleMask").Instance();
         }
 
         protected override void Draw(DrawingHandleBase handle)

Resources/Prototypes/1_Temperature.yml

@@ -1,22 +0,0 @@
-- type: entity
-  id: thing_that_heats_up_on_its_own_and_dies
-  name: Thing that heats up on its own and dies
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Sprite
-    texture: Objects/Misc/shoes.png
-
-  - type: Icon
-    texture: Objects/Misc/shoes.png
-
-  - type: Damageable
-    resistanceset: Standard
-
-  - type: Destructible
-    thresholdtype: Total
-    thresholdvalue: 100
-
-  - type: Temperature
-    firedamagethreshold: 200
-    firedamagecoefficient: 20

Resources/Prototypes/Cargo/products.yml

@@ -27,7 +27,7 @@
   icon:
     sprite: Objects/Tools/flashlight.rsi
     state: lantern_off
-  product: crate_flashlight
+  product: CrateFlashlights
   cost: 3000
   category: Engineering
   group: market
@@ -39,7 +39,7 @@
   icon:
     sprite: Objects/Lighting/light_tube.rsi
     state: normal
-  product: crate_light_bulb
+  product: CrateLightBulb
   cost: 200
   category: Engineering
   group: market
@@ -49,7 +49,7 @@
   id: cargo.fireextinguisher
   description: Puts out fires. Or propels you in space.
   icon: Objects/Misc/fire_extinguisher.png
-  product: crate_fire_extinguisher
+  product: CrateFireExtinguisher
   cost: 300
   category: Other
   group: market
@@ -61,7 +61,7 @@
   icon:
     sprite: Objects/Misc/bureaucracy.rsi
     state: pen
-  product: crate_pen
+  product: CratePen
   cost: 10
   category: Other
   group: market
@@ -73,7 +73,7 @@
   icon:
     sprite: Objects/Fun/bikehorn.rsi
     state: icon
-  product: crate_bikehorn
+  product: CrateBikeHorn
   cost: 300
   category: Other
   group: market
@@ -85,7 +85,7 @@
   icon:
     sprite: Objects/Melee/cleaver.rsi
     state: butch
-  product: crate_cleaver
+  product: CrateCleaver
   cost: 300
   category: Other
   group: blackmarket
@@ -95,7 +95,7 @@
   id: cargo.fueltank
   description: Movable fuel tank for welders. No boom boom.
   icon: Buildings/weldtank.png
-  product: crate_fueltank
+  product: CrateFuelTank
   cost: 200
   category: Engineering
   group: market
@@ -107,7 +107,7 @@
   icon:
     sprite: Buildings/medical_scanner.rsi
     state: scanner_open
-  product: crate_medscanner
+  product: CrateMedicalScanner
   cost: 400
   category: Medical
   group: market
@@ -117,7 +117,7 @@
   id: cargo.glass
   description: 50 sheets of glass.
   icon: Objects/Materials/sheet_glass.png
-  product: crate_glass
+  product: CrateGlass
   cost: 50
   category: Engineering
   group: market
@@ -127,7 +127,7 @@
   id: cargo.cable
   description: 50 coils of cable.
   icon: Objects/Tools/cable_coil.png
-  product: crate_cable
+  product: CrateCable
   cost: 50
   category: Engineering
   group: market

Resources/Prototypes/Construction/machines.yml

@@ -1,6 +1,6 @@
 - type: construction
   name: Wall Light
-  id: wall_light
+  id: WallLight
   keywords: [fixture, lamp]
   category: Machines
   description: A simple wall-mounted light fixture.
@@ -10,7 +10,7 @@
     sprite: Objects/Lighting/lighting.rsi
     state: on
 
-  result: poweredlight
+  result: Poweredlight
   steps:
   - material: Metal
     amount: 1

Resources/Prototypes/Construction/structures.yml

@@ -23,12 +23,12 @@
 
 - type: construction
   name: Table
-  id: table
+  id: Table
   category: Structures
   icon:
     sprite: Buildings/table_solid.rsi
     state: plain_preview
-  result: table
+  result: Table
   placementmode: SnapgridCenter
   steps:
   - material: Metal
@@ -36,14 +36,14 @@
 
 - type: construction
   name: Window
-  id: window
+  id: Window
   category: Structures
   description: Clear.
   icon:
     sprite: Buildings/window.rsi
     state: full
   objecttype: Structure
-  result: window
+  result: Window
   placementmode: SnapgridCenter
   steps:
   - material: Glass
@@ -51,14 +51,14 @@
 
 - type: construction
   name: Low Wall
-  id: low_wall
+  id: LowWall
   category: Structures
   description: A low wall used for mounting windows.
   icon:
     sprite: Buildings/low_wall.rsi
     state: metal
   objecttype: Structure
-  result: low_wall
+  result: LowWall
   placementmode: SnapgridCenter
   steps:
   - material: Metal
@@ -74,14 +74,14 @@
 
 - type: construction
   name: Rein Window
-  id: rwindow
+  id: ReinforcedWindow
   category: Structures
   description: Clear but tough.
   icon:
     sprite: Buildings/rwindow.rsi
     state: full
   objecttype: Structure
-  result: rwindow
+  result: ReinforcedWindow
   placementmode: SnapgridCenter
   steps:
   - material: Glass

Resources/Prototypes/Entities/Buildings/Storage/closet_base.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: locker_generic
+  id: LockerGeneric
   name: Locker
   description: A standard-issue Nanotrasen storage unit.
   components:
@@ -10,11 +10,9 @@
     - state: generic
     - state: generic_door
       map: ["enum.StorageVisualLayers.Door"]
-
   - type: Icon
     sprite: Buildings/closet.rsi
     state: generic_door
-
   - type: Clickable
   - type: InteractionOutline
   - type: Collidable
@@ -38,7 +36,6 @@
       state_open: generic_open
       state_closed: generic_door
   - type: Sound
-
   placement:
     snap:
     - Wall

Resources/Prototypes/Entities/Buildings/Storage/closet_types.yml

@@ -1,7 +1,7 @@
 - type: entity
-  id: locker_tool
+  id: LockerTool
   name: Tool Locker
-  parent: locker_generic
+  parent: LockerGeneric
   components:
   - type: Sprite
     sprite: Buildings/closet.rsi
@@ -9,27 +9,25 @@
     - state: eng
     - state: eng_tool_door
       map: ["enum.StorageVisualLayers.Door"]
-
   - type: Appearance
     visuals:
     - type: StorageVisualizer2D
       state_open: eng_open
       state_closed: eng_tool_door
-
   - type: Icon
     state: eng_tool_door
 
 - type: entity
-  id: locker_tool_filled
+  id: LockerToolFilled
   name: Tool Locker (Filled)
-  parent: locker_tool
+  parent: LockerTool
   components:
   - type: ToolLockerFill
 
 - type: entity
-  id: locker_electrical_supplies
+  id: LockerElectricalSupplies
   name: Electrical Supplies Locker
-  parent: locker_generic
+  parent: LockerGeneric
   components:
   - type: Sprite
     sprite: Buildings/closet.rsi
@@ -37,20 +35,18 @@
     - state: eng
     - state: eng_elec_door
       map: ["enum.StorageVisualLayers.Door"]
-
   - type: Appearance
     visuals:
     - type: StorageVisualizer2D
       state_open: eng_open
       state_closed: eng_elec_door
-
   - type: Icon
     state: eng_elec_door
 
 - type: entity
-  id: locker_welding_supplies
+  id: LockerWeldingSupplies
   name: Welding Supplies Locker
-  parent: locker_generic
+  parent: LockerGeneric
   components:
   - type: Sprite
     sprite: Buildings/closet.rsi
@@ -69,9 +65,9 @@
     state: eng_weld_door
 
 - type: entity
-  id: locker_radiation_suit
+  id: LockerRadiationSuit
   name: Radiation Suit Locker
-  parent: locker_generic
+  parent: LockerGeneric
   components:
   - type: Sprite
     sprite: Buildings/closet.rsi
@@ -90,9 +86,9 @@
     state: eng_rad_door
 
 - type: entity
-  id: locker_medical
+  id: LockerMedical
   name: Medical Locker
-  parent: locker_generic
+  parent: LockerGeneric
   components:
   - type: Sprite
     sprite: Buildings/closet.rsi
@@ -111,9 +107,9 @@
     state: med_door
 
 - type: entity
-  id: locker_chemistry
+  id: LockerChemistry
   name: Chemistry Locker
-  parent: locker_generic
+  parent: LockerGeneric
   components:
   - type: Sprite
     sprite: Buildings/closet.rsi
@@ -132,9 +128,9 @@
     state: chemical_door
 
 - type: entity
-  id: locker_science
+  id: LockerScience
   name: Science Locker
-  parent: locker_generic
+  parent: LockerGeneric
   components:
   - type: Sprite
     sprite: Buildings/closet.rsi

Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: crate_generic
+  id: CrateGeneric
   name: Crate
   description: A large container for items.
   components:
@@ -10,11 +10,9 @@
     - state: crate
     - state: crate_door
       map: ["enum.StorageVisualLayers.Door"]
-
   - type: Icon
     sprite: Buildings/crate.rsi
     state: crate
-
   - type: Clickable
   - type: InteractionOutline
   - type: Collidable
@@ -27,19 +25,15 @@
   - type: Physics
     mass: 25
     Anchored: false
-
   - type: EntityStorage
     Capacity: 60
   - type: PlaceableSurface
-
   - type: Damageable
   - type: Destructible
     thresholdvalue: 100
-
   - type: Appearance
     visuals:
     - type: StorageVisualizer2D
       state_open: crate_open
       state_closed: crate_door
-
   - type: Sound

Resources/Prototypes/Entities/Buildings/Storage/crate_types.yml

@@ -1,128 +1,116 @@
 - type: entity
-  id: crate_plastic
+  id: CratePlastic
   name: Plastic Crate
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: Sprite
     layers:
     - state: plasticcrate
     - state: plasticcrate_door
       map: ["enum.StorageVisualLayers.Door"]
-
   - type: Appearance
     visuals:
     - type: StorageVisualizer2D
       state_open: plasticcrate_open
       state_closed: plasticcrate_door
-
   - type: Icon
     state: plasticcrate
 
 - type: entity
-  id: crate_freezer
+  id: CrateFreezer
   name: Freezer
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: Sprite
     layers:
     - state: freezer
     - state: freezer_door
       map: ["enum.StorageVisualLayers.Door"]
-
   - type: Appearance
     visuals:
     - type: StorageVisualizer2D
       state_open: freezer_open
       state_closed: freezer_door
-
   - type: Icon
     state: freezer
 
 - type: entity
-  id: crate_hydroponics
+  id: CrateHydroponics
   name: Hydroponics Crate
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: Sprite
     layers:
     - state: hydrocrate
     - state: hydrocrate_door
       map: ["enum.StorageVisualLayers.Door"]
-
   - type: Appearance
     visuals:
     - type: StorageVisualizer2D
       state_open: hydrocrate_open
       state_closed: hydrocrate_door
-
   - type: Icon
     state: hydrocrate
 
 - type: entity
-  id: crate_medical
+  id: CrateMedical
   name: Medical Crate
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: Sprite
     layers:
     - state: medicalcrate
     - state: medicalcrate_door
       map: ["enum.StorageVisualLayers.Door"]
-
   - type: Appearance
     visuals:
     - type: StorageVisualizer2D
       state_open: medicalcrate_open
       state_closed: medicalcrate_door
-
   - type: Icon
     state: medicalcrate
 
 - type: entity
-  id: crate_radiation
+  id: CrateRadiation
   name: Radiation Gear Crate
   description: Is not actually lead lined. Do not store your plutonium in this.
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: Sprite
     layers:
     - state: radiationcrate
     - state: radiationcrate_door
       map: ["enum.StorageVisualLayers.Door"]
-
   - type: Appearance
     visuals:
     - type: StorageVisualizer2D
       state_open: radiationcrate_open
       state_closed: radiationcrate_door
-
   - type: Icon
     state: radiationcrate
 
 - type: entity
-  id: crate_internals
+  id: CrateInternals
   name: Internals Crate
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: Sprite
     layers:
     - state: o2crate
     - state: o2crate_door
       map: ["enum.StorageVisualLayers.Door"]
-
   - type: Appearance
     visuals:
     - type: StorageVisualizer2D
       state_open: o2crate_open
       state_closed: o2crate_door
-
   - type: Icon
     state: o2crate
 
 - type: entity
-  id: crate_flashlight
+  id: CrateFlashlights
   name: Flashlight Crate (x5)
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: StorageFill
     contents:
@@ -133,9 +121,9 @@
       - FlashlightLantern
 
 - type: entity
-  id: crate_light_bulb
+  id: CrateLightBulb
   name: Light Bulb Crate (x10)
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: StorageFill
     contents:
@@ -151,20 +139,20 @@
       - LightBulb
 
 - type: entity
-  id: crate_fire_extinguisher
+  id: CrateFireExtinguisher
   name: Fire Extinguisher Crate (x3)
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: StorageFill
     contents:
-      - fire_extinguisher
+      - FireExtinguisher
-      - fire_extinguisher
+      - FireExtinguisher
-      - fire_extinguisher
+      - FireExtinguisher
 
 - type: entity
-  id: crate_pen
+  id: CratePen
   name: Pen Crate (x10)
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: StorageFill
     contents:
@@ -180,9 +168,9 @@
       - Pen
 
 - type: entity
-  id: crate_bikehorn
+  id: CrateBikeHorn
   name: Bike Horn Crate (x5)
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: StorageFill
     contents:
@@ -193,9 +181,9 @@
       - BikeHorn
 
 - type: entity
-  id: crate_cleaver
+  id: CrateCleaver
   name: Cleaver Crate (x5)
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: StorageFill
     contents:
@@ -206,36 +194,36 @@
       - ButchCleaver
 
 - type: entity
-  id: crate_fueltank
+  id: CrateFuelTank
   name: Fuel Tank
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: StorageFill
     contents:
-      - weldtank
+      - WeldingFuelTank
 
 - type: entity
-  id: crate_medscanner
+  id: CrateMedicalScanner
   name: Medical Scanner
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: StorageFill
     contents:
-      - medical_scanner
+      - MedicalScanner
 
 - type: entity
-  id: crate_glass
+  id: CrateGlass
   name: Glass Sheet Crate (x50)
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: StorageFill
     contents:
       - GlassStack
 
 - type: entity
-  id: crate_cable
+  id: CrateCable
   name: Cable Coil Crate (x50)
-  parent: crate_generic
+  parent: CrateGeneric
   components:
   - type: StorageFill
     contents:

Resources/Prototypes/Entities/Buildings/airlock_base.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: airlock
+  id: Airlock
   name: Airlock
   description: It opens, it closes, and maybe crushes you.
   components:
@@ -7,7 +7,6 @@
   - type: InteractionOutline
   - type: Sprite
     netsync: false
-
     drawdepth: Mobs # They're on the same layer as mobs, perspective.
     sprite: Buildings/airlock_basic.rsi
     layers:
@@ -18,11 +17,9 @@
       map: ["enum.DoorVisualLayers.BaseUnlit"]
     - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-
   - type: Icon
     sprite: Buildings/airlock_basic.rsi
     state: closed
-
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
@@ -43,17 +40,15 @@
     interfaces:
     - key: enum.WiresUiKey.Key
       type: WiresBoundUserInterface
-
   - type: Occluder
   - type: SnapGrid
     offset: Center
-
   placement:
     mode: SnapgridCenter
 
 - type: entity
-  id: airlock_glass
+  id: AirlockGlass
-  parent: airlock
+  parent: Airlock
   components:
   - type: Airlock
     occludes: false

Resources/Prototypes/Entities/Buildings/airlock_types.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: airlock
+  parent: Airlock
   id: airlock_external
   name: External Airlock
   components:
@@ -18,7 +18,7 @@
     - type: WiresVisualizer2D
 
 - type: entity
-  parent: airlock
+  parent: Airlock
   id: airlock_engineering
   name: Engineering Airlock
   components:
@@ -38,7 +38,7 @@
 
 
 - type: entity
-  parent: airlock
+  parent: Airlock
   id: airlock_medical
   name: Medical Airlock
   components:
@@ -49,7 +49,7 @@
     sprite: Buildings/airlock_medical.rsi
 
 - type: entity
-  parent: airlock_glass
+  parent: AirlockGlass
   id: airlock_medical_glass
   name: Glass Medical Airlock
   components:
@@ -61,7 +61,7 @@
 
 
 - type: entity
-  parent: airlock
+  parent: Airlock
   id: airlock_science
   name: Science Airlock
   components:
@@ -72,7 +72,7 @@
     sprite: Buildings/airlock_science.rsi
 
 - type: entity
-  parent: airlock_glass
+  parent: AirlockGlass
   id: airlock_science_glass
   name: Glass Science Airlock
   components:

Resources/Prototypes/Entities/Buildings/asteroid.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: asteroid_rock
+  id: AsteroidRock
   name: Asteroid Rock
   components:
   - type: AsteroidRock

Resources/Prototypes/Entities/Buildings/booze_dispenser.yml

@@ -1,8 +1,8 @@
 - type: entity
-  id: booze_dispenser
+  id: BoozeDispenser
   name: Booze Dispenser
   description: A booze dispenser with a single slot for a container to be filled.
-  parent: reagent_dispenser_base
+  parent: ReagentDispenserBase
   components:
   - type: Sprite
     texture: Buildings/chemicals.rsi/booze_dispenser.png

Resources/Prototypes/Entities/Buildings/catwalk.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: catwalk
+  id: Catwalk
   name: Catwalk
   components:
   - type: Clickable
@@ -12,12 +12,9 @@
   - type: Icon
     sprite: Buildings/catwalk.rsi
     state: catwalk_preview
-
   - type: SnapGrid
     offset: Center
-
   - type: IconSmooth
     key: catwalk
     base: catwalk_
-
   - type: Catwalk

Resources/Prototypes/Entities/Buildings/chem_dispenser.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: chem_dispenser
   name: Chemical Dispenser
-  parent: reagent_dispenser_base
+  parent: ReagentDispenserBase
   description: An industrial grade chemical dispenser with a sizeable chemical supply.
   components:
   - type: Sprite

Resources/Prototypes/Entities/Buildings/computers.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: computerBase
+  id: ComputerBase
   name: Computer
   abstract: true
   components:
@@ -44,8 +44,8 @@
 
 
 - type: entity
-  id: computerAlert
+  id: ComputerAlert
-  parent: computerBase
+  parent: ComputerBase
   name: Alerts Computer
   components:
   - type: Appearance
@@ -56,8 +56,8 @@
 
 
 - type: entity
-  id: computerPowerMonitoring
+  id: ComputerPowerMonitoring
-  parent: computerBase
+  parent: ComputerBase
   name: Power Monitoring Computer
   components:
   - type: Appearance
@@ -68,8 +68,8 @@
 
 
 - type: entity
-  id: computerSupplyOrdering
+  id: ComputerSupplyOrdering
-  parent: computerBase
+  parent: ComputerBase
   name: Cargo Ordering Computer
   components:
   - type: Appearance
@@ -100,8 +100,8 @@
       type: CargoConsoleBoundUserInterface
 
 - type: entity
-  id: computerSupplyRequest
+  id: ComputerSupplyRequest
-  parent: computerSupplyOrdering
+  parent: ComputerSupplyOrdering
   name: Cargo Request Computer
   components:
   - type: Appearance
@@ -113,8 +113,8 @@
     requestOnly: true
 
 - type: entity
-  id: computerMedicalRecords
+  id: ComputerMedicalRecords
-  parent: computerBase
+  parent: ComputerBase
   name: Medical Records Computer
   components:
   - type: Appearance
@@ -125,8 +125,8 @@
 
 
 - type: entity
-  id: computerResearchAndDevelopment
+  id: ComputerResearchAndDevelopment
-  parent: computerBase
+  parent: ComputerBase
   name: R&D Computer
   components:
   - type: Appearance
@@ -149,8 +149,8 @@
     priority: Low
 
 - type: entity
-  id: computerId
+  id: ComputerId
-  parent: computerBase
+  parent: ComputerBase
   name: ID Card Computer
   components:
   - type: AccessReader
@@ -167,8 +167,8 @@
       screen: id
 
 - type: entity
-  id: computerComms
+  id: ComputerComms
-  parent: computerBase
+  parent: ComputerBase
   name: Communications Computer
   components:
   - type: Appearance

Resources/Prototypes/Entities/Buildings/fuel_tank.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: weldtank
+  id: WeldingFuelTank
   name: Fueltank
   description: A storage tank containing welding fuel.
   components:

Resources/Prototypes/Entities/Buildings/furniture.yml

@@ -1,6 +1,6 @@
 - type: entity
   name: Stool
-  id: stool
+  id: Stool
   components:
   - type: Clickable
   - type: InteractionOutline
@@ -15,7 +15,7 @@
 
 - type: entity
   name: White Office Chair
-  id: chairOfficeLight
+  id: ChairOfficeLight
   components:
   - type: Rotatable
   - type: Clickable
@@ -30,7 +30,7 @@
 
 - type: entity
   name: Dark Office Chair
-  id: chairOfficeDark
+  id: ChairOfficeDark
   components:
   - type: Rotatable
   - type: Clickable
@@ -45,7 +45,7 @@
 
 - type: entity
   name: Chair
-  id: chair
+  id: Chair
   components:
   - type: Clickable
   - type: InteractionOutline

Resources/Prototypes/Entities/Buildings/girder.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: girder
+  id: Girder
   name: Girder
   components:
   - type: Clickable

Resources/Prototypes/Entities/Buildings/lathe.yml

@@ -18,7 +18,7 @@
 
 - type: entity
   parent: BaseLathe
-  id: autolathe
+  id: Autolathe
   name: "Autolathe"
   components:
   - type: Sprite
@@ -61,7 +61,7 @@
 
 - type: entity
   parent: BaseLathe
-  id: protolathe
+  id: Protolathe
   name: "Protolathe"
   components:
   - type: Sprite

Resources/Prototypes/Entities/Buildings/lighting.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: wall_light
+  id: WallLight
   name: "Unpowered Light"
   components:
   - type: Clickable
@@ -9,25 +9,22 @@
   - type: Sprite
     sprite: Buildings/light_tube.rsi
     state: on
-
   - type: Icon
     sprite: Buildings/light_tube.rsi
     state: on
-
   - type: PointLight
     radius: 8
     energy: 1.2
     offset: "0.5, 0"
     color: "#DCDCC6"
-
   placement:
     snap:
     - Wallmount
 
 - type: entity
   name: Light
-  id: poweredlight
+  id: Poweredlight
-  parent: wall_light
+  parent: WallLight
   components:
   - type: Clickable
   - type: InteractionOutline
@@ -35,43 +32,35 @@
   - type: Sprite
     sprite: Buildings/light_tube.rsi
     state: off
-
   - type: Icon
     sprite: Buildings/light_tube.rsi
     state: off
-
   - type: PointLight
     enabled: false
-
   - type: PowerDevice
     priority: Low
-
   - type: PoweredLight
     bulb: Tube
 
 - type: entity
   name: Small Light
-  id: poweredsmalllight
+  id: PoweredSmallLight
-  parent: wall_light
+  parent: WallLight
   components:
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
     sprite: Buildings/light_small.rsi
     state: off
-
   - type: Icon
     sprite: Buildings/light_small.rsi
     state: off
-
   - type: PointLight
     energy: 1.0
     enabled: false
     offset: "-0.5, 0"
-
   - type: PowerDevice
     priority: Low
-
   - type: PoweredLight
     bulb: Bulb
 

Resources/Prototypes/Entities/Buildings/low_wall.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: low_wall
+  id: LowWall
   name: Low Wall
   description: Goes up to about your waist.
   placement:
@@ -35,7 +35,7 @@
     base: metal_
 
 - type: entity
-  id: low_wall_overlay
+  id: LowWallOverlay
   name: Low Wall Overlay
   abstract: true
   components:

Resources/Prototypes/Entities/Buildings/medical_scanner.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: medical_scanner
+  id: MedicalScanner
   name: Medical Scanner
   description: A bulky medical scanner.
   components:

Resources/Prototypes/Entities/Buildings/mirror.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: mirror
+  id: Mirror
   name: Mirror
   components:
   - type: Sprite

Resources/Prototypes/Entities/Buildings/power.yml

@@ -161,7 +161,7 @@
     offset: Center
 
 - type: entity
-  id: smes_dry
+  id: SmesDry
   parent: SMES
   components:
   - type: PowerStorage

Resources/Prototypes/Entities/Buildings/reagent_dispenser_base.yml

@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  id: reagent_dispenser_base
+  id: ReagentDispenserBase
   components:
   - type: Clickable
   - type: InteractionOutline

Resources/Prototypes/Entities/Buildings/shuttle.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: Pilot Chair
   description: The driver seat of a prestigious battle cruiser.
-  id: pilotseat_chair
+  id: PilotSeatChair
   components:
   - type: Sprite
     sprite: Buildings/furniture.rsi

Resources/Prototypes/Entities/Buildings/soda_dispenser.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: soda_dispenser
   name: Soda Dispenser
-  parent: reagent_dispenser_base
+  parent: ReagentDispenserBase
   description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers.
   components:
   - type: Sprite

Resources/Prototypes/Entities/Buildings/table.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: table
+  id: Table
-  name: "table"
+  name: "Table"
   components:
   - type: Clickable
   - type: InteractionOutline

Resources/Prototypes/Entities/Buildings/vending_machines.yml

@@ -43,7 +43,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_ammo
+  id: VendingMachineAmmo
   name: AmmoVend
   components:
   - type: VendingMachine
@@ -53,7 +53,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_booze
+  id: VendingMachineBooze
   name: Booze-O-Mat
   components:
   - type: VendingMachine
@@ -63,7 +63,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_cart
+  id: VendingMachineCart
   name: PTech
   components:
   - type: VendingMachine
@@ -73,7 +73,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_chapel
+  id: VendingMachineChapel
   name: PietyVend
   components:
   - type: VendingMachine
@@ -83,7 +83,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_cigs
+  id: VendingMachineCigs
   name: Cigarette machine
   components:
   - type: VendingMachine
@@ -93,7 +93,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_coffee
+  id: VendingMachineCoffee
   name: Hot Drinks machine
   components:
   - type: VendingMachine
@@ -113,7 +113,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_cola
+  id: VendingMachineCola
   name: Robust Softdrinks
   components:
   - type: VendingMachine
@@ -123,7 +123,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_dinnerware
+  id: VendingMachineDinnerware
   name: Dinnerware
   components:
   - type: VendingMachine
@@ -133,7 +133,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_discount
+  id: VendingMachineDiscount
   name: Discount Dan's
   components:
   - type: VendingMachine
@@ -143,7 +143,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_engivend
+  id: VendingMachineEngivend
   name: Engi-Vend
   components:
   - type: VendingMachine
@@ -153,7 +153,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_hats
+  id: VendingMachineHats
   name: Hatlord 9000
   components:
   - type: VendingMachine
@@ -163,7 +163,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_magivend
+  id: VendingMachineMagivend
   name: MagiVend
   components:
   - type: VendingMachine
@@ -173,7 +173,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_medical
+  id: VendingMachineMedical
   name: NanoMed Plus
   components:
   - type: VendingMachine
@@ -183,7 +183,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_mining
+  id: VendingMachineMining
   name: Dwarven Mining Equipment
   components:
   - type: VendingMachine
@@ -193,7 +193,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_nutri
+  id: VendingMachineNutri
   name: NutriMax
   components:
   - type: VendingMachine
@@ -203,7 +203,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_robotics
+  id: VendingMachineRobotics
   name: Robotech Deluxe
   components:
   - type: VendingMachine
@@ -213,7 +213,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_sales
+  id: VendingMachineSales
   name: Sales
   components:
   - type: VendingMachine
@@ -223,7 +223,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_sec
+  id: VendingMachineSec
   name: SecTech
   components:
   - type: VendingMachine
@@ -233,7 +233,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_seeds
+  id: VendingMachineSeeds
   name: MegaSeed Servitor
   components:
   - type: VendingMachine
@@ -243,7 +243,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_shoes
+  id: VendingMachineShoes
   name: Shoelord 9000
   components:
   - type: VendingMachine
@@ -253,7 +253,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_smartfridge
+  id: VendingMachineSmartFridge
   name: SmartFridge
   components:
   - type: VendingMachine
@@ -263,7 +263,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_snack
+  id: VendingMachineSnack
   name: Getmore Chocolate Corp
   components:
   - type: VendingMachine
@@ -273,7 +273,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_soviet
+  id: VendingMachineSoviet
   name: Товарищ-vend
   components:
   - type: VendingMachine
@@ -283,7 +283,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_sovietsoda
+  id: VendingMachineSovietSoda
   name: BODA
   components:
   - type: VendingMachine
@@ -293,7 +293,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_suits
+  id: VendingMachineSuits
   name: Suitlord 9000
   components:
   - type: VendingMachine
@@ -303,7 +303,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_theater
+  id: VendingMachineTheater
   name: AutoDrobe
   components:
   - type: VendingMachine
@@ -313,7 +313,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_vendomat
+  id: VendingMachineVendomat
   name: Vendomat
   components:
   - type: VendingMachine
@@ -323,7 +323,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_vox
+  id: VendingMachineVox
   name: Trader Supply
   components:
   - type: VendingMachine
@@ -333,7 +333,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_wallmed
+  id: VendingMachineWallMedical
   name: NanoMed
   components:
   - type: VendingMachine
@@ -343,7 +343,7 @@
 
 - type: entity
   parent: VendingMachine
-  id: vending_machine_youtool
+  id: VendingMachineYouTool
   name: YouTool
   components:
   - type: VendingMachine

Resources/Prototypes/Entities/Buildings/walls.yml

@@ -24,7 +24,7 @@
   - type: Damageable
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: Occluder
     sizeX: 32
     sizeY: 32
@@ -47,7 +47,7 @@
     sprite: Buildings/Walls/brick.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: brick
@@ -63,7 +63,7 @@
     sprite: Buildings/Walls/clock.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: clock
@@ -79,7 +79,7 @@
     sprite: Buildings/Walls/clown.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: clown
@@ -96,7 +96,7 @@
     sprite: Buildings/Walls/cult.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: cult
@@ -112,7 +112,7 @@
     sprite: Buildings/Walls/debug.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: debug
@@ -128,7 +128,7 @@
     sprite: Buildings/Walls/diamond.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: diamond
@@ -145,7 +145,7 @@
     sprite: Buildings/Walls/gold.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: gold
@@ -161,7 +161,7 @@
     sprite: Buildings/Walls/ice.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: ice
@@ -177,7 +177,7 @@
     sprite: Buildings/Walls/metal.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: metal
@@ -193,7 +193,7 @@
     sprite: Buildings/Walls/plasma.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: plasma
@@ -209,7 +209,7 @@
     sprite: Buildings/Walls/plastic.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: plastic
@@ -225,7 +225,7 @@
     sprite: Buildings/Walls/reinforced.rsi
   - type: Destructible
     thresholdvalue: 300
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: reinforced
@@ -242,7 +242,7 @@
     sprite: Buildings/Walls/riveted.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: riveted
@@ -258,7 +258,7 @@
     sprite: Buildings/Walls/sandstone.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: sandstone
@@ -274,7 +274,7 @@
     sprite: Buildings/Walls/silver.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: silver
@@ -291,7 +291,7 @@
     sprite: Buildings/Walls/solid.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
     destroysound: /Audio/effects/metalbreak.ogg
   - type: IconSmooth
     key: walls
@@ -308,7 +308,7 @@
     sprite: Buildings/Walls/uranium.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: uranium
@@ -324,7 +324,7 @@
     sprite: Buildings/Walls/wood.rsi
   - type: Destructible
     thresholdvalue: 100
-    spawnondestroy: girder
+    spawnondestroy: Girder
   - type: IconSmooth
     key: walls
     base: wood

Resources/Prototypes/Entities/Buildings/windows.yml

@@ -1,5 +1,5 @@
 - type: entity
-  id: window
+  id: Window
   name: Window
   description: Don't smudge up the glass down there.
   placement:
@@ -14,11 +14,9 @@
     netsync: false
     drawdepth: WallTops
     sprite: Buildings/window.rsi
-
   - type: Icon
     sprite: Buildings/window.rsi
     state: full
-
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
@@ -27,25 +25,21 @@
   - type: Damageable
   - type: Destructible
     thresholdvalue: 100
-
   - type: SnapGrid
     offset: Center
-
   - type: Window
-    base: window
+    base: Window
 
 - type: entity
-  id: rwindow
+  id: ReinforcedWindow
   name: Reinforced Window
-  parent: window
+  parent: Window
   components:
   - type: Sprite
     drawdepth: WallTops
     sprite: Buildings/rwindow.rsi
-
   - type: Window
-    base: rwindow
+    base: ReinforcedWindow
-
   - type: Icon
     sprite: Buildings/rwindow.rsi
     state: full

Resources/Prototypes/Entities/Items/fire_extinguisher.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: Fire Extinguisher
   parent: BaseItem
-  id: fire_extinguisher
+  id: FireExtinguisher
   description: Extinguishes fires.
   components:
   - type: Sprite

Resources/Prototypes/Entities/Mobs/human.yml

@@ -23,8 +23,6 @@
   - type: Stomach
     max_volume: 250
     digestionDelay: 20
-
-
   - type: Inventory
   - type: Constructor
   - type: Clickable
@@ -60,19 +58,16 @@
       color: "#e8b59b"
       sprite: Mob/human.rsi
       state: human_l_leg
-
+    - shader: StencilClear
-    - shader: stencilClear
       sprite: Mob/human.rsi
       state: human_l_leg
-    - shader: stencilMask
+    - shader: StencilMask
       map: ["enum.HumanoidVisualLayers.StencilMask"]
       sprite: Mob/masking_helpers.rsi
       state: female_full
       visible: false
-
     - map: ["enum.Slots.INNERCLOTHING"]
-      shader: stencilDraw
+      shader: StencilDraw
-
     - map: ["enum.HumanoidVisualLayers.LHand"]
       color: "#e8b59b"
       sprite: Mob/human.rsi
@@ -81,7 +76,6 @@
       color: "#e8b59b"
       sprite: Mob/human.rsi
       state: human_r_hand
-
     - map: ["enum.Slots.IDCARD"]
     - map: ["enum.Slots.GLOVES"]
     - map: ["enum.Slots.SHOES"]
@@ -100,24 +94,19 @@
     - map: ["enum.Slots.HEAD"]
     - map: ["hand-left"]
     - map: ["hand-right"]
-
   - type: Icon
     sprite: Mob/human.rsi
     state: human_basic
-
   - type: Physics
     mass: 85
-
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.35,-0.35,0.35,0.35"
       mask: 30
       layer: 4
-
   - type: Input
     context: "human"
-
   - type: Species
     Template: Human
     HeatResistance: 323
@@ -125,15 +114,12 @@
   - type: OverlayEffectsUI
   - type: HeatResistance
   - type: Damageable
-
   - type: Eye
     zoom: 0.5, 0.5
-
   - type: CameraRecoil
   - type: Appearance
     visuals:
     - type: SpeciesVisualizer2D
-
   - type: CombatMode
   - type: Teleportable
   - type: Examiner
@@ -187,15 +173,15 @@
         sprite: Mob/human.rsi
         state: human_l_leg
 
-      - shader: stencilClear
+      - shader: StencilClear
-      - shader: stencilMask
+      - shader: StencilMask
         map: ["enum.HumanoidVisualLayers.StencilMask"]
         sprite: Mob/masking_helpers.rsi
         state: female_full
         visible: false
 
       - map: ["enum.Slots.INNERCLOTHING"]
-        shader: stencilDraw
+        shader: StencilDraw
 
       - map: ["enum.HumanoidVisualLayers.LHand"]
         color: "#e8b59b"

Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: bullet_10mm
   name: 10mm Bullet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: bullet_10mmf
   name: 10mm Bullet (Flash)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: bullet_10mmhv
   name: 10mm Bullet (High-Velocity)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -34,7 +34,7 @@
 - type: entity
   id: bullet_10mml
   name: 10mm Bullet (L)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -45,7 +45,7 @@
 - type: entity
   id: bullet_10mmp
   name: 10mm Bullet (Practice)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -56,7 +56,7 @@
 - type: entity
   id: bullet_10mmr
   name: 10mm Bullet (Rubber)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile

Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: pellet_12g
   name: 12g Pellet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile

Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: bullet_20mm
   name: 20mm Bullet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile

Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: bullet_24mm
   name: 24mm Bullet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: bullet_24mmf
   name: 24mm Bullet (Flash)
-  parent: bullet_basef
+  parent: BulletBaseFlash
   abstract: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: bullet_24mmhv
   name: 24mm Bullet (High-Velocity)
-  parent: bullet_basehv
+  parent: BulletBaseHighVelocity
   abstract: true
   components:
   - type: Projectile
@@ -34,7 +34,7 @@
 - type: entity
   id: bullet_24mml
   name: 24mm Bullet (L)
-  parent: bullet_basel
+  parent: BulletBaseL
   abstract: true
   components:
   - type: Projectile
@@ -45,7 +45,7 @@
 - type: entity
   id: bullet_24mmp
   name: 24mm Bullet (Practice)
-  parent: bullet_basep
+  parent: BulletBasePractice
   abstract: true
   components:
   - type: Projectile
@@ -56,7 +56,7 @@
 - type: entity
   id: bullet_24mmr
   name: 24mm Bullet (Rubber)
-  parent: bullet_baser
+  parent: BulletBaseRubber
   abstract: true
   components:
   - type: Projectile

Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: bullet_45mm
   name: .45mm Bullet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: bullet_45mmf
   name: .45mm Bullet (Flash)
-  parent: bullet_basef
+  parent: BulletBaseFlash
   abstract: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: bullet_45mmhv
   name: .45mm Bullet (High-Velocity)
-  parent: bullet_basehv
+  parent: BulletBaseHighVelocity
   abstract: true
   components:
   - type: Projectile
@@ -34,7 +34,7 @@
 - type: entity
   id: bullet_45mml
   name: .45mm Bullet (L)
-  parent: bullet_basel
+  parent: BulletBaseL
   abstract: true
   components:
   - type: Projectile
@@ -45,7 +45,7 @@
 - type: entity
   id: bullet_45mmp
   name: .45mm Bullet (Practice)
-  parent: bullet_basep
+  parent: BulletBasePractice
   abstract: true
   components:
   - type: Projectile
@@ -56,7 +56,7 @@
 - type: entity
   id: bullet_45mmr
   name: .45mm Bullet (Rubber)
-  parent: bullet_baser
+  parent: BulletBaseRubber
   abstract: true
   components:
   - type: Projectile

Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: bullet_556mm
   name: 5.56mm Bullet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: bullet_556mmf
   name: 5.56mm Bullet (Flash)
-  parent: bullet_basef
+  parent: BulletBaseFlash
   abstract: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: bullet_556mmhv
   name: 5.56mm Bullet (High-Velocity)
-  parent: bullet_basehv
+  parent: BulletBaseHighVelocity
   abstract: true
   components:
   - type: Projectile
@@ -34,7 +34,7 @@
 - type: entity
   id: bullet_556mml
   name: 5.56mm Bullet (L)
-  parent: bullet_basel
+  parent: BulletBaseL
   abstract: true
   components:
   - type: Projectile
@@ -45,7 +45,7 @@
 - type: entity
   id: bullet_556mmp
   name: 5.56mm Bullet (Practice)
-  parent: bullet_basep
+  parent: BulletBasePractice
   abstract: true
   components:
   - type: Projectile
@@ -56,7 +56,7 @@
 - type: entity
   id: bullet_556mmr
   name: 5.56mm Bullet (Rubber)
-  parent: bullet_baser
+  parent: BulletBaseRubber
   abstract: true
   components:
   - type: Projectile

Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: bullet_65mm
   name: 6.5mm Bullet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: bullet_65mmf
   name: 6.5mm Bullet (Flash)
-  parent: bullet_basef
+  parent: BulletBaseFlash
   abstract: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: bullet_65mmhv
   name: 6.5mm Bullet (High-Velocity)
-  parent: bullet_basehv
+  parent: BulletBaseHighVelocity
   abstract: true
   components:
   - type: Projectile
@@ -34,7 +34,7 @@
 - type: entity
   id: bullet_65mml
   name: 6.5mm Bullet (L)
-  parent: bullet_basel
+  parent: BulletBaseL
   abstract: true
   components:
   - type: Projectile
@@ -45,7 +45,7 @@
 - type: entity
   id: bullet_65mmp
   name: 6.5mm Bullet (Practice)
-  parent: bullet_basep
+  parent: BulletBasePractice
   abstract: true
   components:
   - type: Projectile
@@ -56,7 +56,7 @@
 - type: entity
   id: bullet_65mmr
   name: 6.5mm Bullet (Rubber)
-  parent: bullet_baser
+  parent: BulletBaseRubber
   abstract: true
   components:
   - type: Projectile

Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: bullet_762mm
   name: 7.62mm Bullet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: bullet_762mmf
   name: 7.62mm Bullet (Flash)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: bullet_762mmhv
   name: 7.62mm Bullet (High-Velocity)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -34,7 +34,7 @@
 - type: entity
   id: bullet_762mml
   name: 7.62mm Bullet (L)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -45,7 +45,7 @@
 - type: entity
   id: bullet_762mmp
   name: 7.62mm Bullet (Practice)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -56,7 +56,7 @@
 - type: entity
   id: bullet_762mmr
   name: 7.62mm Bullet (Rubber)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile

Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: bullet_9mm
   name: 9mm Bullet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: bullet_9mmf
   name: 9mm Bullet (Flash)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: bullet_9mmhv
   name: 9mm Bullet (High-Velocity)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -34,7 +34,7 @@
 - type: entity
   id: bullet_9mml
   name: 9mm Bullet (L)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -45,7 +45,7 @@
 - type: entity
   id: bullet_9mmp
   name: 9mm Bullet (Practice)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -56,7 +56,7 @@
 - type: entity
   id: bullet_9mmr
   name: 9mm Bullet (Rubber)
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile

Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: bullet_32
   name: .32 Bullet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: bullet_32f
   name: .32 Bullet (Flash)
-  parent: bullet_basef
+  parent: BulletBaseFlash
   abstract: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: bullet_32hv
   name: .32 Bullet (High-Velocity)
-  parent: bullet_basehv
+  parent: BulletBaseHighVelocity
   abstract: true
   components:
   - type: Projectile
@@ -34,7 +34,7 @@
 - type: entity
   id: bullet_32l
   name: .32 Bullet (L)
-  parent: bullet_basel
+  parent: BulletBaseL
   abstract: true
   components:
   - type: Projectile
@@ -45,7 +45,7 @@
 - type: entity
   id: bullet_32p
   name: .32 Bullet (Practice)
-  parent: bullet_basep
+  parent: BulletBasePractice
   abstract: true
   components:
   - type: Projectile
@@ -56,7 +56,7 @@
 - type: entity
   id: bullet_32r
   name: .32 Bullet (Rubber)
-  parent: bullet_baser
+  parent: BulletBaseRubber
   abstract: true
   components:
   - type: Projectile

Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: bullet_357
   name: .357 Bullet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: bullet_357f
   name: .357 Bullet (Flash)
-  parent: bullet_basef
+  parent: BulletBaseFlash
   abstract: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: bullet_357hv
   name: .357 Bullet (High-Velocity)
-  parent: bullet_basehv
+  parent: BulletBaseHighVelocity
   abstract: true
   components:
   - type: Projectile
@@ -34,7 +34,7 @@
 - type: entity
   id: bullet_357l
   name: .357 Bullet (L)
-  parent: bullet_basel
+  parent: BulletBaseL
   abstract: true
   components:
   - type: Projectile
@@ -45,7 +45,7 @@
 - type: entity
   id: bullet_357p
   name: .357 Bullet (Practice)
-  parent: bullet_basep
+  parent: BulletBasePractice
   abstract: true
   components:
   - type: Projectile
@@ -56,7 +56,7 @@
 - type: entity
   id: bullet_357r
   name: .357 Bullet (Rubber)
-  parent: bullet_baser
+  parent: BulletBaseRubber
   abstract: true
   components:
   - type: Projectile

Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: bullet_44
   name: .44 Bullet
-  parent: bullet_base
+  parent: BulletBase
   abstract: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: bullet_44f
   name: .44 Bullet (Flash)
-  parent: bullet_basef
+  parent: BulletBaseFlash
   abstract: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: bullet_44hv
   name: .44 Bullet (High-Velocity)
-  parent: bullet_basehv
+  parent: BulletBaseHighVelocity
   abstract: true
   components:
   - type: Projectile
@@ -34,7 +34,7 @@
 - type: entity
   id: bullet_44l
   name: .44 Bullet (L)
-  parent: bullet_basel
+  parent: BulletBaseL
   abstract: true
   components:
   - type: Projectile
@@ -45,7 +45,7 @@
 - type: entity
   id: bullet_44p
   name: .44 Bullet (Practice)
-  parent: bullet_basep
+  parent: BulletBasePractice
   abstract: true
   components:
   - type: Projectile
@@ -56,7 +56,7 @@
 - type: entity
   id: bullet_44r
   name: .44 Bullet (Rubber)
-  parent: bullet_baser
+  parent: BulletBaseRubber
   abstract: true
   components:
   - type: Projectile