Serialization v3 content PR (#3491)

* serv3 in shared pt 1

* beginning of deepclone api

* progress in implementing ideepclone & serv3 in content

* adds target

* its cant hurt you it cant hurt you

* more changes to content.server

* adds dataclasses

* almost there

* renamed & edited entry

* finishes refactoring content to use serv3

* gasmixture runtimes, next: reagentunit

* fucin hell that was an annoying one

* adds flags

* fixes some yaml errors

* removes comment

* fixes generic components for now

* removes todo
actually clones values my god paul
fixes bug involving resolving custom data classes from other proj
renames dataclass
fixes spritecomp
adds WithFormat.Constants support

* adds deepclone to ResistanceSet

* adds a bunch of deepclone implementations
adds a deepclone analyzer (TODO)
adds a deep clone fallback for classes & structs

* fixes a bunch of runtimes

* adds deepclone to entityuid

* adds generator to sln

* gets rid of warnings

* fixes

* argh

* componentdata refactors

* more deepclone impl

* heck me i reworked all of content deepclone

* renames custom dataclasstarget

* misc

* reworks prototypes

* deepclone nuke

* renamed customdataclass attribute

* fixes everything

* misc fixed

* the killcommit

* getting there

* changed yamlfieldattribute namespace

* adds back iselfserialize

* renames everything to data(field/definition)

* ouch

* Fix most errors on content

* Fix more errors in content

* Fix some components

* work on tests

* fixes some customdataclasses

* fuggin shit

* yes

* yeas

* Remove data classes

* Data field naming fixes

* arg

* Git resetti RobustToolbox

* Merge fixes

* General fixes

* Fix startup serialization errors

* Fix DamageContainerPrototype when supported classes or types are null

* Implement construction graph step type serializer

* Fix up construction serialization

* Fix up construction serialization part 2

* Fix null list in technology database component

* Fix body serialization

* Fix entity storage serialization

* Fix actions serialization

* Fix AI serialization

* Fix reaction serialization

* Fix body serialization

* Fix grid atmosphere serialization

* Rename IServ3Manager to ISerializationManager

* Convert every non generic serializer to the new format, general fixes

* Serialization and body system fix

* pushinheritance fix

* Update all prototypes to have a parent and have consistent id/parent properties

* Merge fixes

* smh my head

* cuddling slaps

* Content commit for engine PR

* stuff

* more fixes

* argh

* yes even you are fixed

* changelog fixes

* fixes seeds

* argh

* Test fixes

* Add writing for alert order prototype

* Fix alert order writing

* FIX

* its been alot ok

* Fix the rest of the visualizers

* Fix server alerts component tests

* Fix alert prototype tests not using the read value

* Fix alert prototype tests initializing serialization multiple times

* THIS IS AN AMERICAN CODEBASE GOD BLESS THE USA

* Add ImplicitDataDefinitionForInheritors to IMechanismBehavior
Fixes the behaviors not being found

* Fix NRE in strap component
Good night to the 1 buckle optimization

* Fix clothing component slot flags serialization tag

* Fix body component in all components test

* Merge fixes

* ffs

* Make construction graph prototype use serialization hooks

* human yaml linted

* a

* Do the thing for construction

* stuff

* a

* monke see yaml linter

* LINT HARDER

* Remove redundant todo

* yes

* Add skip hook argument to readers and copiers

* we gamin

* test/datafield fixes

* adds more verbose validation

* moves linter to action

* Improve construction graph step type serializer error message

* Fix ammo box component NRE

* gamin

* some updates to the linter

* yes

* removes that test

* misc fixes

* array fix
priority fix
misc fixes

* adds proper info the validation

* adds alwaysrelevant usa

* Make yaml linter take half as long to run (~50% less)

* Make yaml linter 5 times faster (~80% less execution time)

* based vera being based

* fixes mapsaving

* warning cleanup & moves surpressor

* removes old msbuild targets

* Revert "Make yaml linter 5 times faster (~80% less execution time)"

This reverts commit 3e6091359a26252c3e98828199553de668031c63.

* Add -nowarn to yaml linter run configuration

* Improve yaml linter message feedback

* Make dependencies an argument instead of a property on the serialization manager

* yamllinting slaps

* Clean up type serializers

* Move yaml linter code to its own method

* Fix yaml errors

* Change yaml linter action name and remove -nowarn

* yaml linter please shut

* Git resetti robust toolbox

Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

Resources/Prototypes/Actions/actions.yml

@@ -48,7 +48,7 @@
 
 - type: action
   actionType: DebugInstant
-  icon: Interface/Alerts/Human/human1.png
+  icon: Interface/Alerts/human_health.rsi/health1.png
   name: "[color=red]Debug Instant[/color]"
   description: "This is a [color=red]debug message[/color]."
   requires: "Requires blah blah"
@@ -60,7 +60,7 @@
 
 - type: action
   actionType: DebugToggle
-  icon: Interface/Alerts/Human/human3.png
+  icon: Interface/Alerts/human_health.rsi/health3.png
   name: "[color=red]Debug Toggle[/color]"
   description: "This is a [color=red]debug message[/color]."
   requires: "Requires blah blah"
@@ -73,7 +73,7 @@
 
 - type: action
   actionType: DebugTargetPoint
-  icon: Interface/Alerts/Human/human4.png
+  icon: Interface/Alerts/human_health.rsi/health4.png
   name: "[color=red]Debug Target Position[/color]"
   description: "This is a [color=red]debug message[/color]."
   filters:
@@ -83,7 +83,7 @@
 
 - type: action
   actionType: DebugTargetPointRepeat
-  icon: Interface/Alerts/Human/human2.png
+  icon: Interface/Alerts/human_health.rsi/health2.png
   name: "[color=red]Repeating Debug Target Position[/color]"
   description: "This is a [color=red]debug message[/color]."
   filters:
@@ -94,7 +94,7 @@
 
 - type: action
   actionType: DebugTargetEntity
-  icon: Interface/Alerts/Human/human6.png
+  icon: Interface/Alerts/human_health.rsi/health6.png
   name: "[color=red]Debug Target Entity[/color]"
   description: "This is a [color=red]debug message[/color]."
   filters:
@@ -104,7 +104,7 @@
 
 - type: action
   actionType: DebugTargetEntityRepeat
-  icon: Interface/Alerts/Human/human5.png
+  icon: Interface/Alerts/human_health.rsi/health5.png
   name: "[color=red]Repeating Debug Target Entity[/color]"
   description: "This is a [color=red]debug message[/color]."
   filters:

Resources/Prototypes/Actions/item_actions.yml

@@ -31,7 +31,7 @@
 
 - type: itemAction
   actionType: DebugInstant
-  icon: Interface/Alerts/Human/human1.png
+  icon: Interface/Alerts/human_health.rsi/health1.png
   iconStyle: BigAction
   name: "[color=red]Debug Item Instant[/color]"
   description: "This is a [color=red]debug message[/color]."
@@ -46,7 +46,7 @@
 - type: itemAction
   actionType: DebugToggle
   iconStyle: BigItem
-  icon: Interface/Alerts/Human/human3.png
+  icon: Interface/Alerts/human_health.rsi/health3.png
   name: "[color=red]Debug Item Toggle[/color]"
   description: "This is a [color=red]debug message[/color]."
   requires: "Requires blah blah"
@@ -60,7 +60,7 @@
 - type: itemAction
   actionType: DebugTargetPoint
   iconStyle: NoItem
-  icon: Interface/Alerts/Human/human4.png
+  icon: Interface/Alerts/human_health.rsi/health4.png
   name: "[color=red]Debug Item Target Position[/color]"
   description: "This is a [color=red]debug message[/color]."
   filters:
@@ -71,7 +71,7 @@
 - type: itemAction
   actionType: DebugTargetPointRepeat
   iconStyle: BigAction
-  icon: Interface/Alerts/Human/human2.png
+  icon: Interface/Alerts/human_health.rsi/health2.png
   name: "[color=red]Repeating Debug Item Target Position[/color]"
   description: "This is a [color=red]debug message[/color]."
   filters:
@@ -83,7 +83,7 @@
 - type: itemAction
   actionType: DebugTargetEntity
   iconStyle: BigAction
-  icon: Interface/Alerts/Human/human6.png
+  icon: Interface/Alerts/human_health.rsi/health6.png
   name: "[color=red]Debug Item Target Entity[/color]"
   description: "This is a [color=red]debug message[/color]."
   filters:
@@ -93,7 +93,7 @@
 
 - type: itemAction
   actionType: DebugTargetEntityRepeat
-  icon: Interface/Alerts/Human/human5.png
+  icon: Interface/Alerts/human_health.rsi/health5.png
   name: "[color=red]Repeating Debug Item Target Entity[/color]"
   description: "This is a [color=red]debug message[/color]."
   filters:

Resources/Prototypes/Alerts/alerts.yml

@@ -197,36 +197,36 @@
 
 - type: alert
   alertType: Debug1
-  icon: /Textures/Interface/Alerts/Human/human1.png
+  icon: /Textures/Interface/Alerts/human_health.rsi/health1.png
   name: Debug1
   description: Debug
 
 - type: alert
   alertType: Debug2
-  icon: /Textures/Interface/Alerts/Human/human2.png
+  icon: /Textures/Interface/Alerts/human_health.rsi/health2.png
   name: Debug2
   description: Debug
 
 - type: alert
   alertType: Debug3
-  icon: /Textures/Interface/Alerts/Human/human3.png
+  icon: /Textures/Interface/Alerts/human_health.rsi/health3.png
   name: Debug3
   description: Debug
 
 - type: alert
   alertType: Debug4
-  icon: /Textures/Interface/Alerts/Human/human4.png
+  icon: /Textures/Interface/Alerts/human_health.rsi/health4.png
   name: Debug4
   description: Debug
 
 - type: alert
   alertType: Debug5
-  icon: /Textures/Interface/Alerts/Human/human5.png
+  icon: /Textures/Interface/Alerts/human_health.rsi/health5.png
   name: Debug5
   description: Debug
 
 - type: alert
   alertType: Debug6
-  icon: /Textures/Interface/Alerts/Human/human6.png
+  icon: /Textures/Interface/Alerts/human_health.rsi/health6.png
   name: Debug6
   description: Debug

Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml

@@ -27,7 +27,6 @@
     sprite: Mobs/Species/Human/organs.rsi
     state: brain
   - type: Mechanism
-    durability: 10
     size: 1
     compatibility: Biological
     behaviors:
@@ -45,7 +44,6 @@
     sprite: Mobs/Species/Human/organs.rsi
     state: eyeballs
   - type: Mechanism
-    durability: 10
     size: 1
     compatibility: Biological
 
@@ -60,7 +58,6 @@
     sprite: Mobs/Species/Human/organs.rsi
     state: heart-on
   - type: Mechanism
-    durability: 10
     size: 1
     compatibility: Biological
     behaviors:
@@ -77,7 +74,6 @@
     sprite: Mobs/Species/Human/organs.rsi
     state: lungs
   - type: Mechanism
-    durability: 13
     size: 1
     compatibility: Biological
     behaviors:
@@ -94,7 +90,6 @@
     sprite: Mobs/Species/Human/organs.rsi
     state: stomach
   - type: Mechanism
-    durability: 13
     size: 1
     compatibility: Biological
     behaviors:
@@ -115,7 +110,6 @@
     sprite: Mobs/Species/Human/organs.rsi
     state: liver
   - type: Mechanism
-    durability: 15
     size: 1
     compatibility: Biological
     behaviors:
@@ -136,6 +130,5 @@
     sprite: Mobs/Species/Human/organs.rsi
     state: kidneys
   - type: Mechanism
-    durability: 20
     size: 1
     compatibility: Biological

Resources/Prototypes/Body/Mechanisms/basic_tests.yml

@@ -7,12 +7,8 @@
   - type: Sprite
   - type: Icon
   - type: Mechanism
-    durability: 80
     size: 4
     compatibility: Universal
-    implantableParts:
-    - Arm
-    - Hand
 
 - type: entity
   id: MechanismHonkModule
@@ -23,6 +19,5 @@
   - type: Sprite
   - type: Icon
   - type: Mechanism
-    durability: 50
     size: 3
     compatibility: Universal

Resources/Prototypes/Body/Parts/human_parts.yml

@@ -52,7 +52,7 @@
     partType: Head
     size: 7
     compatibility: Biological
-    isVital: true
+    vital: true
     mechanisms:
     - BrainHuman
     - EyesHuman

Resources/Prototypes/Body/Parts/slime_parts.yml

@@ -51,7 +51,7 @@
       partType: Head
       size: 7
       compatibility: Biological
-      isVital: true
+      vital: true
       mechanisms:
         - BrainHuman
         - EyesHuman

Resources/Prototypes/Catalog/Fills/Boxes/food.yml

@@ -14,6 +14,5 @@
   - type: Item
     color: "#951710"
     sprite: Objects/Storage/donkpocket.rsi
-    state: icon
   - type: Storage
     capacity: 30

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -22,6 +22,7 @@
     sprite: Clothing/OuterClothing/Hardsuits/capspace.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Hardsuits/capspace.rsi
+  - type: PressureProtection
     highPressureMultiplier: 0.5
     lowPressureMultiplier: 100
 

Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml

@@ -36,10 +36,7 @@
             max: 1
       - !type:DoActsBehavior
         acts: ["Destruction"]
-
   - type: Occluder
-    sizeX: 32
-    sizeY: 32
 
 - type: entity
   id: Bookshelf0

Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml

@@ -74,4 +74,3 @@
   - type: PointLight
     radius: 2
     color: "#2cb2e8"
-    power: 0.25

Resources/Prototypes/Entities/Constructible/Furniture/storage.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: Rack
   name: rack
-  desription: "A rack for storing things on."
+  description: "A rack for storing things on."
   placement:
     mode: SnapgridCenter
   components:

Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml

@@ -39,10 +39,11 @@
     visuals:
     - type: GasCanisterVisualizer
       stateConnected: can-connector
-      stateO0: can-o0
-      stateO1: can-o1
-      stateO2: can-o2
-      stateO3: can-o3
+      pressureStates:
+        - can-o0
+        - can-o1
+        - can-o2
+        - can-o3
   - type: UserInterface
     interfaces:
       - key: enum.GasCanisterUiKey.Key

Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml

@@ -12,7 +12,6 @@
   - type: CargoConsole
   - type: CargoOrderDatabase
   - type: GalacticMarket
-    static: true
     products:
       - cargo.emergencyexplosive
       - cargo.emergencyfire

Resources/Prototypes/Entities/Constructible/Power/wires.yml

@@ -33,7 +33,7 @@
   parent: WireBase
   id: HVWire
   name: HV Wire
-  decription: "An orange high voltage power cable."
+  description: "An orange high voltage power cable."
   components:
   - type: Sprite
     sprite: Constructible/Power/Wires/hv_cable.rsi

Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/base.yml

@@ -18,7 +18,6 @@
             - Impassable
             - MobImpassable
             - VaultImpassable
-      IsScrapingFloor: true
     - type: SnapGrid
       offset: Center
     - type: Pullable

Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/particles.yml

@@ -5,9 +5,10 @@
   parent: BulletBase
   components:
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/particle.rsi
-      state: particle0
-      shader: unshaded
+      layers:
+      - sprite: Constructible/Specific/Engines/PA/particle.rsi
+        state: particle0
+        shader: unshaded
     - type: Projectile
       delete_on_collide: false
       soundHit: /Audio/Weapons/Guns/Hits/bullet_hit.ogg

Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml

@@ -49,10 +49,11 @@
   - type: Appearance
     visuals:
     - type: GravityGeneratorVisualizer
-      broken: "broken"
-      unpowered: "off"
-      off: "off"
-      on: "on"
+      spritemap:
+        broken: "broken"
+        unpowered: "off"
+        off: "off"
+        on: "on"
 
   placement:
     mode: AlignTileAny

Resources/Prototypes/Entities/Effects/chemistry_effects.yml

@@ -11,8 +11,6 @@
       visuals:
         - type: SmokeVisualizer
     - type: Occluder
-      sizeX: 32
-      sizeY: 32
     - type: SnapGrid
       offset: Center
     - type: SmokeSolutionAreaEffect

Resources/Prototypes/Entities/Mobs/NPCs/dummy_npcs.yml

@@ -4,7 +4,6 @@
   parent: BaseHumanMob_Content
   id: HumanMob_PathDummy
   description: A miserable pile of secrets.
-  drawdepth: Mobs
   suffix: AI
   components:
   - type: UtilityAI

Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml

@@ -2,7 +2,6 @@
   save: false
   abstract: true
   id: SimpleMobBase
-  drawdepth: Mobs
   suffix: AI
   components:
   - type: Tag

Resources/Prototypes/Entities/Mobs/Player/human.yml

@@ -4,7 +4,6 @@
   parent: BaseHumanMob_Content
   id: HumanMob_Content
   description: A miserable pile of secrets.
-  drawdepth: Mobs
   components:
   - type: Mind
     showExamineInfo: true

Resources/Prototypes/Entities/Mobs/Player/slime.yml

@@ -4,7 +4,6 @@
   parent: BaseSlimeMob_Content
   id: SlimeMob_Content
   description: A miserable pile of slime
-  drawdepth: Mobs
   components:
     - type: Mind
       showExamineInfo: true

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -4,7 +4,6 @@
   name: Urist McHands
   id: BaseHumanMob_Content
   description: A miserable pile of secrets.
-  drawdepth: Mobs
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Mobs/Species/slime.yml

@@ -5,7 +5,6 @@
   name: Slime Person
   id: BaseSlimeMob_Content
   description: A miserable pile of slime.
-  drawdepth: Mobs
   abstract: true
   components:
     - type: Tag

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml

@@ -13,7 +13,6 @@
     state: cigpapers
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
-    state: cigpapers
 
 - type: entity
   id: PaperRolling
@@ -30,7 +29,6 @@
       state: cigpaper
     - type: Item
       sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
-      state: cigpaper
 
 - type: entity
   id: CigaretteFilter
@@ -47,4 +45,3 @@
       state: cigfilter
     - type: Item
       sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
-      state: cigfilter

Resources/Prototypes/Entities/Objects/Consumable/drinks.yml

@@ -56,7 +56,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_clear.rsi
   - type: SolutionContainer
-    fillingState: glass
     maxVol: 50
   - type: SolutionTransfer
     transferAmount: 5

Resources/Prototypes/Entities/Objects/Consumable/food.yml

@@ -53,7 +53,6 @@
       reagents:
       - ReagentId: chem.Nutriment
         Quantity: 4
-    trash: TrashSnackBowl
   - type: Sprite
     sprite: Objects/Consumable/Food/aesirsalad.rsi
 
@@ -776,7 +775,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/donut2.rsi
   - type: Item
-    sprite: Objects/Consumable/Food/donut2.rsi.rsi
+    sprite: Objects/Consumable/Food/donut2.rsi
 
 - type: entity
   parent: FoodBase
@@ -792,7 +791,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-blue.rsi
   - type: Item
-    sprite: Objects/Consumable/Food/egg-blue.rsi.rsi
+    sprite: Objects/Consumable/Food/egg-blue.rsi
 
 - type: entity
   parent: FoodBase
@@ -808,7 +807,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-green.rsi
   - type: Item
-    sprite: Objects/Consumable/Food/egg-green.rsi.rsi
+    sprite: Objects/Consumable/Food/egg-green.rsi
 
 - type: entity
   parent: FoodBase
@@ -824,7 +823,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-mime.rsi
   - type: Item
-    sprite: Objects/Consumable/Food/egg-mime.rsi.rsi
+    sprite: Objects/Consumable/Food/egg-mime.rsi
 
 - type: entity
   parent: FoodBase
@@ -840,7 +839,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-orange.rsi
   - type: Item
-    sprite: Objects/Consumable/Food/egg-orange.rsi.rsi
+    sprite: Objects/Consumable/Food/egg-orange.rsi
 
 - type: entity
   parent: FoodBase
@@ -856,7 +855,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-purple.rsi
   - type: Item
-    sprite: Objects/Consumable/Food/egg-purple.rsi.rsi
+    sprite: Objects/Consumable/Food/egg-purple.rsi
 
 - type: entity
   parent: FoodBase
@@ -872,7 +871,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-rainbow.rsi
   - type: Item
-    sprite: Objects/Consumable/Food/egg-rainbow.rsi.rsi
+    sprite: Objects/Consumable/Food/egg-rainbow.rsi
 
 - type: entity
   parent: FoodBase
@@ -888,8 +887,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-red.rsi
   - type: Item
-    sprite: Objects/Consumable/Food/egg-red.rsi.rsi
-
+    sprite: Objects/Consumable/Food/egg-red.rsi
 
 - type: entity
   parent: FoodBase
@@ -1941,7 +1939,6 @@
   - type: Food
     trash: TrashPopcorn
   - type: SolutionContainer
-    transfer_amount: 1
     contents:
       reagents:
       - ReagentId: chem.Nutriment
@@ -2173,7 +2170,6 @@
       reagents:
       - ReagentId: chem.Nutriment
         Quantity: 4
-    trash: TrashSOSJerky
   - type: Sprite
     sprite: Objects/Consumable/Food/sosjerky.rsi
   - type: Item

Resources/Prototypes/Entities/Objects/Fun/instruments.yml

@@ -12,7 +12,7 @@
     - key: enum.InstrumentUiKey.Key
       type: InstrumentBoundUserInterface
   - type: Item
-    Size: 24
+    size: 24
 
 - type: entity
   name: synthesizer

Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

@@ -15,7 +15,6 @@
     sprite: Objects/Specific/Chemistry/beakers.rsi
     HeldPrefix: beaker
   - type: SolutionContainer
-    fillingState: beaker
     maxVol: 50
     caps: OpenContainer, FitsInDispenser # can add and remove solutions and fits in the chemmaster.
   - type: SolutionTransfer
@@ -35,7 +34,6 @@
   - type: Item
     HeldPrefix: beaker
   - type: SolutionContainer
-    fillingState: beakerlarge
     maxVol: 100
     caps: OpenContainer, FitsInDispenser
   - type: SolutionTransfer
@@ -54,8 +52,6 @@
     sprite: Objects/Specific/Chemistry/dropper.rsi
     state: dropper
   - type: SolutionContainer
-    fillingState: dropper
-    fillingSteps: 2
     maxVol: 5
   - type: SolutionTransfer
     transferAmount: 5.0
@@ -71,8 +67,6 @@
     sprite: Objects/Specific/Chemistry/syringe.rsi
     state: 0
   - type: SolutionContainer
-    fillingState: syringe
-    fillingSteps: 5
     maxVol: 15
   - type: Injector
     injectOnly: false

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml

@@ -7,6 +7,7 @@
   - type: Ammo
     caliber: Shotgun
     ammoSpread: 40
+    projectilesFired: 6
     soundCollectionEject: ShellEject
   - type: Sprite
     netsync: false
@@ -53,7 +54,6 @@
     sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
   - type: Ammo
     projectile: PelletShotgun
-    projectilesFired: 6
 
 - type: entity
   id: ShellShotgunFlash
@@ -64,7 +64,6 @@
     sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi
   - type: Ammo
     projectile: PelletShotgunFlash
-    projectilesFired: 6
 
 - type: entity
   id: ShellShotgunIncendiary
@@ -75,7 +74,6 @@
     sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi
   - type: Ammo
     projectile: PelletShotgun
-    projectilesFired: 6
 
 - type: entity
   id: ShellShotgunPractice
@@ -86,7 +84,6 @@
     sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi
   - type: Ammo
     projectile: PelletShotgun
-    projectilesFired: 6
 
 - type: entity
   id: ShellTranquilizer

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml

@@ -22,7 +22,7 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: foambox
-    
+
 - type: entity
   id: BoxCartridgeCap
   name: "cap gun cartridge box"
@@ -32,5 +32,5 @@
     capacity: 20
     fillPrototype: CartridgeCap
   - type: Sprite
-    sprite: Objects\Storage\boxes.rsi
+    sprite: Objects/Storage/boxes.rsi
     state: box

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml

@@ -9,7 +9,7 @@
   - type: Sprite
     netsync: false
     directional: true
-    sprite: Objects\Weapons\Guns\Ammunition\Casings\ammo_casing.rsi
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     layers:
     - state: base
       map: ["enum.AmmoVisualLayers.Base"]
@@ -21,4 +21,4 @@
   parent: CartridgeCapBase
   components:
   - type: Ammo
-    projectile: BulletCap
+    projectile: BulletCap

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -107,7 +107,7 @@
     angleDecay: 45
     powerCellPrototype: PowerCellSmallSuper
     powerCellRemovable: true
-    base_fire_cost: 600
+    fireCost: 600
     ammoPrototype: XrayLaser
     soundGunshot: /Audio/Weapons/Guns/Gunshots/laser3.ogg
   - type: Appearance

Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml

@@ -11,7 +11,6 @@
     state: icon
   - type: Item
     size: 24
-    state: icon
   - type: MagazineBarrel
     currentSelector: Automatic
     allSelectors:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml

@@ -9,7 +9,6 @@
     netsync: false
   - type: Item
     size: 24
-    state: icon
 
 - type: entity
   name: china lake

Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -18,7 +18,6 @@
     state: icon
   - type: Item
     size: 12
-    state: icon
   - type: MagazineBarrel
     caliber: Pistol
     magazineTypes:
@@ -155,7 +154,6 @@
     - Single
     magazineTypes:
     - Pistol
-    capacity: 1
     fireRate: 8
     minAngle: 10
     maxAngle: 60

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -13,7 +13,6 @@
     state: bullet
   - type: Physics
     anchored: false
-    edgeslide: false
     hard: false
     shapes:
     - !type:PhysShapeAabb
@@ -98,7 +97,7 @@
       shader: unshaded
   - type: Physics
     anchored: false
-    edgeslide: false
+
     hard: false
     shapes:
     - !type:PhysShapeAabb
@@ -119,7 +118,7 @@
     state: frag
   - type: ExplosiveProjectile
   - type: Projectile
-    deleteOnCollide: false
+    delete_on_collide: false
   - type: Explosive
     devastationRange: 1
     heavyImpactRange: 2
@@ -141,7 +140,7 @@
     sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi
     state: grenade
   - type: Projectile
-    deleteOnCollide: false
+    delete_on_collide: false
     soundHit: /Audio/Effects/gen_hit.ogg
   - type: StunnableProjectile
     paralyzeAmount: 8
@@ -158,7 +157,7 @@
     state: grenade
   - type: ExplosiveProjectile
   - type: Projectile
-    deleteOnCollide: false
+    delete_on_collide: false
   - type: Explosive
     devastationRange: 1
     heavyImpactRange: 2
@@ -176,7 +175,7 @@
     sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi
     state: grenade
   - type: Projectile
-    deleteOnCollide: false
+    delete_on_collide: false
     soundHit: /Audio/Effects/flash_bang.ogg
   - type: FlashProjectile
     range: 7
@@ -194,7 +193,7 @@
     state: grenade
   - type: ExplosiveProjectile
   - type: Projectile
-    deleteOnCollide: false
+    delete_on_collide: false
   - type: Explosive
     devastationRange: 0
     heavyImpactRange: 1
@@ -212,7 +211,7 @@
     sprite: Objects/Fun/toys.rsi
     state: foamdart
   - type: Projectile
-    deleteOnCollide: true
+    delete_on_collide: true
     soundHit: /Audio/Guns/Hits/snap.ogg
     damages:
       Blunt: 2
@@ -228,6 +227,6 @@
     sprite: Objects/Fun/toys.rsi
     state: capbullet
   - type: Projectile
-    deleteOnCollide: true
+    delete_on_collide: true
     damages:
       Piercing: 0

Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -7,8 +7,6 @@
   components:
   - type: Sprite
     netsync: false
-  - type: Icon
-    state: icon
   - type: Item
     size: 24
     state: icon

Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -11,7 +11,6 @@
     state: icon
   - type: Item
     size: 24
-    state: icon
   - type: MagazineBarrel
     currentSelector: Automatic
     allSelectors:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -92,7 +92,6 @@
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
-    state: icon
   - type: RangedWeapon
   - type: BoltActionBarrel
     caliber: Shotgun
@@ -110,8 +109,8 @@
     soundGunshot: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg
     soundInsert: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
-    sound_bolt_open: /Audio/Weapons/Guns/Cock/shotgun_open.ogg
-    sound_bolt_closed: /Audio/Weapons/Guns/Cock/shotgun_close.ogg
+    soundBoltOpen: /Audio/Weapons/Guns/Cock/shotgun_open.ogg
+    soundBoltClosed: /Audio/Weapons/Guns/Cock/shotgun_close.ogg
   - type: Appearance
     visuals:
     - type: BarrelBoltVisualizer
@@ -216,7 +215,6 @@
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
-    state: icon
   - type: RangedWeapon
   - type: BoltActionBarrel
     caliber: Shotgun

Resources/Prototypes/Reagents/Materials/glass.yml

@@ -29,7 +29,7 @@
 - type: material
   id: rpglass
   name: reinforced plasma glass
-  icon: Objects/Materials/Sheets/glass.rsi/prglass.png
+  icon: Objects/Materials/Sheets/glass.rsi/rpglass.png
   parent: GlassMaterialBase
 
 - type: material

Resources/Prototypes/Reagents/Materials/materials.yml

@@ -35,7 +35,7 @@
 - type: material
   id: wood
   name: wood
-  icon: Objects/Materials/materials.rsi/wood_plank.png
+  icon: Objects/Materials/materials.rsi/wood.png
   density: 6000
   electricResistivity: 1.0e+13
   thermalConductivity: 1.5

Resources/Prototypes/Reagents/Materials/metals.yml

@@ -14,19 +14,19 @@
 - type: material
   id: adamantine
   name: adamantine
-  icon: Objects/Materials/Ingots/adamantine.png
+  icon: Objects/Materials/ingots.rsi/adamantine.png
   parent: MetalMaterialBase
 
 - type: material
   id: copper
   name: copper
-  icon: Objects/Materials/Ingots/copper.png
+  icon: Objects/Materials/ingots.rsi/copper.png
   parent: MetalMaterialBase
 
 - type: material
   id: gold
   name: gold
-  icon: Objects/Materials/Ingots/gold.png
+  icon: Objects/Materials/ingots.rsi/gold.png
   density: 10000
   electricResistivity: 8.0e-9
   thermalConductivity: 30
@@ -35,19 +35,19 @@
 - type: material
   id: hydrogen
   name: hydrogen
-  icon: Objects/Materials/Ingots/hydrogen.png
+  icon: Objects/Materials/ingots.rsi/hydrogen.png
   parent: MetalMaterialBase
 
 - type: material
   id: iron
   name: iron
-  icon: Objects/Materials/Ingots/iron.png
+  icon: Objects/Materials/ingots.rsi/iron.png
   parent: MetalMaterialBase
 
 - type: material
   id: silver
   name: silver
-  icon: Objects/Materials/Ingots/silver.png
+  icon: Objects/Materials/ingots.rsi/silver.png
   parent: MetalMaterialBase
 
 - type: material

Resources/Prototypes/Reagents/chemicals.yml

@@ -130,7 +130,7 @@
   id: chem.FluorosulfuricAcid
   name: fluorosulfuric acid
   desc: An extremely corrosive chemical substance.
-  physicalDecs: strong-smelling
+  physicalDesc: strong-smelling
   color: "#5050ff"
   boilingPoint: 165
   meltingPoint: -87

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

@@ -3,10 +3,6 @@
   start: start
   graph:
     - node: start
-      conditions:
-        - !type:ComponentInTile
-          value: false
-          component: Window
       actions:
         - !type:SpawnPrototype
           prototype: SheetSteel1
@@ -14,6 +10,10 @@
         - !type:DeleteEntity { }
       edges:
         - to: lowWall
+          conditions:
+            - !type:ComponentInTile
+              value: false
+              component: Window
           steps:
             - material: Steel
               amount: 3

Resources/Prototypes/Recipes/Lathes/sheet.yml

@@ -1,8 +1,8 @@
 - type: latheRecipe
   id: SheetSteel
   icon:
-    sprite: Objects/Materials/sheets.rsi
-    state: metal
+    sprite: Objects/Materials/Sheets/metal.rsi
+    state: steel
   result: SheetSteel1
   completetime: 500
   materials:
@@ -11,7 +11,7 @@
 - type: latheRecipe
   id: GlassStack
   icon:
-    sprite: Objects/Materials/sheets.rsi
+    sprite: Objects/Materials/Sheets/glass.rsi
     state: glass
   result: SheetGlass1
   completetime: 500

Resources/Prototypes/Recipes/Lathes/tools.yml

@@ -37,7 +37,7 @@
 - type: latheRecipe
   id: CableStack
   name: cable coil
-  icon: /Textures/Objects/Tools/cables.rsi/coil-30.png
+  icon: /Textures/Objects/Tools/cable-coils.rsi/coil-30.png
   result: ApcExtensionCableStack1
   completetime: 500
   materials:

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

@@ -1,7 +1,6 @@
 - type: job
   id: HeadOfPersonnel
   name: "head of personnel"
-  head: true
   positions: 1
   startingGear: HoPGear
   departments:

Resources/Prototypes/Stacks/Materials/materials.yml

@@ -1,7 +1,7 @@
 - type: stack
   id: Banananium
   name: banananium
-  icon: /Textures/Objects/Materials/materials.rsi/banananium.png
+  icon: /Textures/Objects/Materials/materials.rsi/bananium.png
   spawn: MaterialBanananium1
 
 - type: stack

Resources/Prototypes/Stacks/power_stacks.yml

@@ -1,7 +1,7 @@
 - type: stack
   id: Cable
   name: cable
-  icon: "/Textures/Objects/Tools/cables.rsi/coil-30.png"
+  icon: "/Textures/Objects/Tools/cable-coils.rsi/coil-30.png"
   spawn: ApcExtensionCableStack1
 
 - type: stack