Remove yml boilerplate for crates (#11982)

Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml

@@ -6,7 +6,7 @@
     - type: Sprite
       layers:
         - state: red
-        - texture: Structures/Storage/Crates/generic.rsi/crate.png
+        - texture: Structures/Storage/Crates/generic.rsi/icon.png
     - type: RandomSpawner
       prototypes:
         - CrateGenericSteel
@@ -31,7 +31,7 @@
     - type: Sprite
       layers:
         - state: red
-        - texture: Structures/Storage/Crates/o2.rsi/o2crate.png
+        - texture: Structures/Storage/Crates/o2.rsi/icon.png
     - type: RandomSpawner
       prototypes:
         - CrateServiceReplacementLights

Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml

@@ -9,7 +9,7 @@
     - type: Sprite
       layers:
         - state: red
-        - texture: Structures/Storage/Crates/generic.rsi/crate_icon.png
+        - texture: Structures/Storage/Crates/generic.rsi/icon.png
     - type: RandomSpawner
       rarePrototypes:
         - SalvageHumanCorpse

Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml

@@ -1,20 +1,22 @@
 - type: entity
-  id: CrateGeneric
   parent: BaseStructureDynamic
+  id: CrateGeneric
   noSpawn: true
   name: crate
   description: A large container for items.
   components:
-  - type: ResistLocker
   - type: Transform
     noRot: true
+  - type: Icon
+    sprite: Structures/Storage/Crates/generic.rsi
+    state: icon
   - type: Sprite
     netsync: false
     noRot: true
     sprite: Structures/Storage/Crates/generic.rsi
     layers:
-    - state: crate
-    - state: crate_door
+    - state: base
+    - state: closed
       map: ["enum.StorageVisualLayers.Door"]
     - state: welded
       visible: false
@@ -33,7 +35,6 @@
       - MachineLayer
   - type: EntityStorage
     capacity: 500
-  - type: Weldable
   - type: PlaceableSurface
     isPlaceable: false # defaults to closed.
   - type: Damageable
@@ -50,8 +51,8 @@
   - type: Appearance
     visuals:
     - type: StorageVisualizer
-      state_open: crate_open
-      state_closed: crate_door
+      state_open: open
+      state_closed: closed
   - type: PaperLabel
     labelSlot:
       insertVerbText: Attach Label
@@ -64,44 +65,40 @@
       entity_storage: !type:Container
       paper_label: !type:ContainerSlot
   - type: ItemSlots
+  - type: Construction
+    graph: CrateGenericSteel
+    node: crategenericsteel
+    containers:
+      - entity_storage
 
 - type: entity
-  id: CrateBaseSecure
-  parent: BaseStructureDynamic
-  noSpawn: true
-  name: crate
-  description: A large container for items.
+  parent: CrateGeneric
+  id: CrateBaseWeldable
   components:
-  - type: Transform
-    noRot: true
+  - type: Weldable
+  - type: ResistLocker
+
+- type: entity
+  parent: CrateGeneric
+  id: CrateBaseSecure
+  components:
+  - type: Lock
+  - type: AccessReader
+  - type: Icon
+    sprite: Structures/Storage/Crates/secure.rsi
+    state: icon
   - type: Sprite
-    netsync: false
-    sprite: Structures/Storage/Crates/generic.rsi
-    snapCardinals: true
+    sprite: Structures/Storage/Crates/secure.rsi
     layers:
-    - state: crate
-    - state: crate_door
+    - state: base
+    - state: closed
       map: ["enum.StorageVisualLayers.Door"]
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
-  - type: InteractionOutline
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-        bounds: "-0.4,-0.4,0.4,0.29"
-      density: 190
-      mask:
-      - SmallMobMask
-      layer:
-      - MachineLayer
-  - type: EntityStorage
-    capacity: 500
-  - type: Weldable
-  - type: PlaceableSurface
-    isPlaceable: false # defaults to closed.
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: StrongMetallic
@@ -113,25 +110,8 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: crate_open
-      state_closed: crate_door
-  - type: PaperLabel
-    labelSlot:
-      insertVerbText: Attach Label
-      ejectVerbText: Remove Label
-      whitelist:
-        components:
-        - Paper
   - type: Construction
     graph: CrateSecure
     node: cratesecure
     containers:
     - entity_storage
-  - type: ContainerContainer
-    containers:
-      entity_storage: !type:Container
-      paper_label: !type:ContainerSlot
-  - type: ItemSlots

Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml

@@ -1,53 +1,22 @@
 - type: entity
+  parent: CrateBaseWeldable
   id: CrateGenericSteel
   name: crate
-  parent: CrateGeneric
   components:
-  - type: Sprite
-    sprite: Structures/Storage/Crates/generic.rsi
-    layers:
-    - state: crate
-    - state: crate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
   - type: Icon
     sprite: Structures/Storage/Crates/generic.rsi
-    state: crate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: crate_open
-      state_closed: crate_door
-  - type: Construction
-    graph: CrateGenericSteel
-    node: crategenericsteel
-    containers:
-    - entity_storage
+  - type: Sprite
+    sprite: Structures/Storage/Crates/generic.rsi
 
 - type: entity
+  parent: CrateBaseWeldable
   id: CratePlastic
   name: plastic crate
-  parent: CrateGeneric
   components:
-  - type: Sprite
-    sprite: Structures/Storage/Crates/plastic.rsi
-    layers:
-    - state: plasticcrate
-    - state: plasticcrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
   - type: Icon
     sprite: Structures/Storage/Crates/plastic.rsi
-    state: plasticcrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: plasticcrate_open
-      state_closed: plasticcrate_door
+  - type: Sprite
+    sprite: Structures/Storage/Crates/plastic.rsi
   - type: Construction
     graph: CratePlastic
     node: crateplastic
@@ -55,570 +24,229 @@
     - entity_storage
 
 - type: entity
+  parent: CrateBaseWeldable
   id: CrateFreezer
   name: freezer
-  parent: CrateGeneric
   components:
-  - type: Sprite
-    sprite: Structures/Storage/Crates/freezer.rsi
-    layers:
-    - state: freezer
-    - state: freezer_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
   - type: Icon
     sprite: Structures/Storage/Crates/freezer.rsi
-    state: freezer_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: freezer_open
-      state_closed: freezer_door
-  - type: Construction
-    graph: CrateGenericSteel
-    node: crategenericsteel
-    containers:
-    - entity_storage
+  - type: Sprite
+    sprite: Structures/Storage/Crates/freezer.rsi
   - type: AntiRottingContainer
 
 - type: entity
   id: CrateHydroponics
   name: hydroponics crate
-  parent: CrateGeneric
+  parent: CrateBaseWeldable
   components:
-  - type: Sprite
-    sprite: Structures/Storage/Crates/hydro.rsi
-    layers:
-    - state: hydrocrate
-    - state: hydrocrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
   - type: Icon
-    sprite: Structures/Storage/Crates/hydro.rsi
-    state: hydrocrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: hydrocrate_open
-      state_closed: hydrocrate_door
-  - type: Construction
-    graph: CrateGenericSteel
-    node: crategenericsteel
-    containers:
-    - entity_storage
+    sprite: Structures/Storage/Crates/hydroponics.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/hydroponics.rsi
 
 - type: entity
+  parent: CrateBaseWeldable
   id: CrateMedical
   name: medical crate
-  parent: CrateGeneric
   components:
-  - type: Sprite
-    sprite: Structures/Storage/Crates/medical.rsi
-    layers:
-    - state: medicalcrate
-    - state: medicalcrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
   - type: Icon
     sprite: Structures/Storage/Crates/medical.rsi
-    state: medicalcrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: medicalcrate_open
-      state_closed: medicalcrate_door
-  - type: Construction
-    graph: CrateGenericSteel
-    node: crategenericsteel
-    containers:
-    - entity_storage
+  - type: Sprite
+    sprite: Structures/Storage/Crates/medical.rsi
 
 - type: entity
+  parent: CrateBaseWeldable
   id: CrateRadiation
   name: radiation gear crate
   description: Is not actually lead lined. Do not store your plutonium in this.
-  parent: CrateGeneric
   components:
-  - type: Sprite
-    sprite: Structures/Storage/Crates/radiation.rsi
-    layers:
-    - state: radiationcrate
-    - state: radiationcrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
   - type: Icon
     sprite: Structures/Storage/Crates/radiation.rsi
-    state: radiationcrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: radiationcrate_open
-      state_closed: radiationcrate_door
-  - type: Construction
-    graph: CrateGenericSteel
-    node: crategenericsteel
-    containers:
-    - entity_storage
+  - type: Sprite
+    sprite: Structures/Storage/Crates/radiation.rsi
 
 - type: entity
+  parent: CrateBaseWeldable
   id: CrateInternals
   name: oxygen crate
-  parent: CrateGeneric
   components:
-  - type: Sprite
-    sprite: Structures/Storage/Crates/o2.rsi
-    layers:
-    - state: o2crate
-    - state: o2crate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
   - type: Icon
     sprite: Structures/Storage/Crates/o2.rsi
-    state: o2crate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: o2crate_open
-      state_closed: o2crate_door
-  - type: Construction
-    graph: CrateGenericSteel
-    node: crategenericsteel
-    containers:
-    - entity_storage
+  - type: Sprite
+    sprite: Structures/Storage/Crates/o2.rsi
 
 - type: entity
+  parent: CrateBaseWeldable
   id: CrateElectrical
   name: electrical crate
-  parent: CrateGeneric
   components:
-  - type: Sprite
-    sprite: Structures/Storage/Crates/electricalcrate.rsi
-    layers:
-    - state: electricalcrate
-    - state: electricalcrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
   - type: Icon
-    sprite: Structures/Storage/Crates/electricalcrate.rsi
-    state: electricalcrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: electricalcrate_open
-      state_closed: electricalcrate_door
-  - type: Construction
-    graph: CrateGenericSteel
-    node: crategenericsteel
-    containers:
-    - entity_storage
+    sprite: Structures/Storage/Crates/electrical.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/electrical.rsi
 
 - type: entity
+  parent: CrateBaseWeldable
   id: CrateEngineering
   name: engineering crate
-  parent: CrateGeneric
   components:
-  - type: Sprite
-    sprite: Structures/Storage/Crates/engicrate.rsi
-    layers:
-    - state: engicrate
-    - state: engicrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
   - type: Icon
-    sprite: Structures/Storage/Crates/engicrate.rsi
-    state: engicrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: engicrate_open
-      state_closed: engicrate_door
-  - type: Construction
-    graph: CrateGenericSteel
-    node: crategenericsteel
-    containers:
-    - entity_storage
+    sprite: Structures/Storage/Crates/engineering.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/engineering.rsi
 
 - type: entity
+  parent: CrateBaseWeldable
   id: CrateScience
   name: science crate
-  parent: CrateGeneric
   components:
-  - type: Sprite
-    sprite: Structures/Storage/Crates/scicrate.rsi
-    layers:
-    - state: scicrate
-    - state: scicrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
   - type: Icon
-    sprite: Structures/Storage/Crates/scicrate.rsi
-    state: scicrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: scicrate_open
-      state_closed: scicrate_door
-  - type: Construction
-    graph: CrateGenericSteel
-    node: crategenericsteel
-    containers:
-    - entity_storage
+    sprite: Structures/Storage/Crates/science.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/science.rsi
 
 - type: entity
+  parent: CrateBaseWeldable
   id: CrateSurgery
   name: surgery crate
-  parent: CrateGeneric
   components:
-  - type: Sprite
-    sprite: Structures/Storage/Crates/surgerycrate.rsi
-    layers:
-    - state: surgerycrate
-    - state: surgerycrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
   - type: Icon
-    sprite: Structures/Storage/Crates/surgerycrate.rsi
-    state: surgerycrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: surgerycrate_open
-      state_closed: surgerycrate_door
-  - type: Construction
-    graph: CrateGenericSteel
-    node: crategenericsteel
-    containers:
-    - entity_storage
+    sprite: Structures/Storage/Crates/surgery.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/surgery.rsi
 
 # Secure Crates
 
 - type: entity
+  parent: CrateBaseSecure
   id: CrateSecgear
   name: secgear crate
-  parent: CrateBaseSecure
   components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/sec_gear.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/sec_gear.rsi
   - type: AccessReader
     access: [["Security"]]
-  - type: Lock
-  - type: Sprite
-    sprite: Structures/Storage/Crates/sec_gear.rsi
-    layers:
-    - state: secgearcrate
-    - state: secgearcrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
-      shader: unshaded
-  - type: Icon
-    sprite: Structures/Storage/Crates/sec_gear.rsi
-    state: secgearcrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: secgearcrate_open
-      state_closed: secgearcrate_door
 
 - type: entity
+  parent: CrateBaseSecure
   id: CrateEngineeringSecure
   name: secure engineering crate
-  parent: CrateBaseSecure
   components:
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: Lock
-  - type: Sprite
-    sprite: Structures/Storage/Crates/engicrate_secure.rsi
-    layers:
-    - state: engicratesecure
-    - state: engicratesecure_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
-      shader: unshaded
   - type: Icon
     sprite: Structures/Storage/Crates/engicrate_secure.rsi
-    state: engicratesecure_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: engicratesecure_open
-      state_closed: engicratesecure_door
+  - type: Sprite
+    sprite: Structures/Storage/Crates/engicrate_secure.rsi
+  - type: AccessReader
+    access: [["Engineering"]]
 
 - type: entity
+  parent: CrateBaseSecure
   id: CrateMedicalSecure
   name: secure medical crate
-  parent: CrateBaseSecure
   components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/medicalcrate_secure.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/medicalcrate_secure.rsi
   - type: AccessReader
     access: [["Medical"]]
-  - type: Lock
-  - type: Sprite
-    sprite: Structures/Storage/Crates/medicalcrate_secure.rsi
-    layers:
-    - state: medicalcratesecure
-    - state: medicalcratesecure_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
-      shader: unshaded
-  - type: Icon
-    sprite: Structures/Storage/Crates/medicalcrate_secure.rsi
-    state: medicalcratesecure_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: medicalcratesecure_open
-      state_closed: medicalcratesecure_door
 
 - type: entity
+  parent: CrateBaseSecure
   id: CratePrivateSecure
   name: private crate
-  parent: CrateBaseSecure
   components:
-  - type: AccessReader
-  - type: Lock
-  - type: Sprite
-    sprite: Structures/Storage/Crates/privatecrate_secure.rsi
-    layers:
-    - state: privatecrate
-    - state: privatecrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
-      shader: unshaded
   - type: Icon
     sprite: Structures/Storage/Crates/privatecrate_secure.rsi
-    state: privatecrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: privatecrate_open
-      state_closed: privatecrate_door
+  - type: Sprite
+    sprite: Structures/Storage/Crates/privatecrate_secure.rsi
 
 - type: entity
+  parent: CrateBaseSecure
   id: CrateScienceSecure
   name: secure science crate
-  parent: CrateBaseSecure
   components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/scicrate_secure.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/scicrate_secure.rsi
   - type: AccessReader
     access: [["Research"]]
-  - type: Lock
-  - type: Sprite
-    sprite: Structures/Storage/Crates/scicrate_secure.rsi
-    layers:
-    - state: scicratesecure
-    - state: scicratesecure_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
-      shader: unshaded
-  - type: Icon
-    sprite: Structures/Storage/Crates/scicrate_secure.rsi
-    state: scicratesecure_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: scicratesecure_open
-      state_closed: scicratesecure_door
 
 - type: entity
+  parent: CrateBaseSecure
   id: CratePlasma
   name: plasma crate
-  parent: CrateBaseSecure
   components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/plasma.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/plasma.rsi
   - type: AccessReader
     access: [["Engineering"]]
-  - type: Lock
-  - type: Sprite
-    sprite: Structures/Storage/Crates/plasma.rsi
-    layers:
-    - state: plasmacrate
-    - state: plasmacrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
-      shader: unshaded
-  - type: Icon
-    sprite: Structures/Storage/Crates/plasma.rsi
-    state: plasmacrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: plasmacrate_open
-      state_closed: plasmacrate_door
 
 - type: entity
+  parent: CrateBaseSecure
   id: CrateSecure
   name: secure crate
-  parent: CrateBaseSecure
   components:
-  - type: AccessReader
-  - type: Lock
-  - type: Sprite
-    sprite: Structures/Storage/Crates/secure.rsi
-    layers:
-    - state: securecrate
-    - state: securecrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
-      shader: unshaded
-  - type: Icon
-    sprite: Structures/Storage/Crates/secure.rsi
-    state: securecrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: securecrate_open
-      state_closed: securecrate_door
+    - type: Icon
+      sprite: Structures/Storage/Crates/secure.rsi
+    - type: Sprite
+      sprite: Structures/Storage/Crates/secure.rsi
 
 - type: entity
+  parent: CrateBaseSecure
   id: CrateHydroSecure
   name: secure hydroponics crate
-  parent: CrateBaseSecure
   components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/hydro_secure.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/hydro_secure.rsi
   - type: AccessReader
     access: [["Hydroponics"]]
-  - type: Lock
-  - type: Sprite
-    sprite: Structures/Storage/Crates/hydro_secure.rsi
-    layers:
-    - state: hydrocratesecure
-    - state: hydrocratesecure_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
-      shader: unshaded
-  - type: Icon
-    sprite: Structures/Storage/Crates/hydro_secure.rsi
-    state: hydrocratesecure_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: hydrocratesecure_open
-      state_closed: hydrocratesecure_door
 
 - type: entity
+  parent: CrateBaseSecure
   id: CrateWeaponSecure
   name: secure weapon crate
-  parent: CrateBaseSecure
   components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/weapon.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/weapon.rsi
   - type: AccessReader
     access: [["Armory"]]
-  - type: Lock
-  - type: Sprite
-    sprite: Structures/Storage/Crates/weapon.rsi
-    layers:
-    - state: weaponcrate
-    - state: weaponcrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
-      shader: unshaded
-  - type: Icon
-    sprite: Structures/Storage/Crates/weapon.rsi
-    state: weaponcrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: weaponcrate_open
-      state_closed: weaponcrate_door
 
 - type: entity
+  parent: CrateBaseSecure
   id: CrateCommandSecure
   name: command crate
-  parent: CrateBaseSecure
   components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/secure.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/secure.rsi
   - type: AccessReader
     access: [["Command"]]
-  - type: Lock
-  - type: Sprite
-    sprite: Structures/Storage/Crates/secure.rsi
-    layers:
-    - state: securecrate
-    - state: securecrate_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
-      shader: unshaded
-  - type: Icon
-    sprite: Structures/Storage/Crates/secure.rsi
-    state: securecrate_icon
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: securecrate_open
-      state_closed: securecrate_door
 
 - type: entity
+  parent: CrateGeneric
   id: CrateLivestock
   name: livestock crate
-  parent: CrateGeneric
   components:
-  - type: EntityStorage
-    capacity: 500
   - type: Sprite
     sprite: Structures/Storage/Crates/livestock.rsi
     layers:
-    - state: livestockcrate
-    - state: livestockcrate_door
+    - state: base
+    - state: closed
       map: ["enum.StorageVisualLayers.Door"]
   - type: Icon
     sprite: Structures/Storage/Crates/livestock.rsi
-    state: livestockcrate
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state_open: livestockcrate_open
-      state_closed: livestockcrate_door
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    state: base
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Recipes/Crafting/crates.yml

@@ -6,7 +6,7 @@
   targetNode: cratelivestock
   category: construction-category-storage
   description: A wooden crate for holding livestock.
-  icon: Structures/Storage/Crates/livestock.rsi/livestockcrate.png
+  icon: Structures/Storage/Crates/livestock.rsi/base.png
   objectType: Structure
 
 - type: construction
@@ -17,7 +17,7 @@
   targetNode: crategenericsteel
   category: construction-category-storage
   description: A metal crate for storing things.
-  icon: Structures/Storage/Crates/generic.rsi/crate_icon.png
+  icon: Structures/Storage/Crates/generic.rsi/icon.png
   objectType: Structure
 
 - type: construction
@@ -28,5 +28,5 @@
   targetNode: crateplastic
   category: construction-category-storage
   description: A plastic crate for storing things.
-  icon: Structures/Storage/Crates/plastic.rsi/plasticcrate_icon.png
+  icon: Structures/Storage/Crates/plastic.rsi/icon.png
   objectType: Structure

Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json

@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/meta.json

@@ -1,39 +0,0 @@
-{
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "electricalcrate",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "electricalcrate_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "electricalcrate_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "electricalcrate_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}

Resources/Textures/Structures/Storage/Crates/engicrate.rsi/meta.json

@@ -1,39 +0,0 @@
-{
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "engicrate",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "engicrate_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "engicrate_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "engicrate_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}

Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json

@@ -1,54 +1,45 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "engicratesecure",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "engicratesecure_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "engicratesecure_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "unlocked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "off",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "locked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "engicratesecure_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json

@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json

@@ -1,39 +1,39 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "freezer",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "freezer_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "freezer_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "freezer_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json

@@ -1,39 +1,39 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "crate",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "crate_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "crate_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "crate_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/hydro.rsi/meta.json

@@ -1,39 +0,0 @@
-{
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "hydrocrate",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "hydrocrate_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "hydrocrate_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "hydrocrate_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}

Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json

@@ -1,54 +1,45 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "hydrocratesecure",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "hydrocratesecure_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "hydrocratesecure_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "unlocked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "off",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "locked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "hydrocratesecure_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json

@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json

@@ -3,21 +3,18 @@
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/crates.dmi",
   "size": {
-      "x": 32,
-      "y": 32
+    "x": 32,
+    "y": 32
   },
   "states": [
     {
-          "name": "livestockcrate",
-          "select": []
+      "name": "base"
     },
     {
-           "name": "livestockcrate_door",
-           "select": []
+      "name": "closed"
     },
     {
-           "name": "livestockcrate_open",
-           "select": []
+      "name": "open"
     }
   ]
-}
+}

Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json

@@ -1,39 +1,39 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "medicalcrate",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "medicalcrate_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "medicalcrate_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "medicalcrate_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json

@@ -1,54 +1,45 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "medicalcratesecure",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "medicalcratesecure_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "medicalcratesecure_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "unlocked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "off",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "locked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "medicalcratesecure_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json

@@ -1,39 +1,39 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "o2crate",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "o2crate_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "o2crate_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "o2crate_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json

@@ -1,54 +1,45 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "plasmacrate",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "plasmacrate_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "plasmacrate_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "unlocked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "off",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "locked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "plasmacrate_open",
-            "select": [],
-            "flags": {}
-	}
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json

@@ -1,39 +1,39 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "plasticcrate",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "plasticcrate_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "plasticcrate_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "plasticcrate_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json

@@ -1,54 +1,45 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "privatecrate",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "privatecrate_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "privatecrate_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "unlocked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "off",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "locked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "privatecrate_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json

@@ -1,39 +1,39 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "radiationcrate",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "radiationcrate_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "radiationcrate_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "radiationcrate_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Crates/scicrate.rsi/meta.json

@@ -1,39 +0,0 @@
-{
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "scicrate",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "scicrate_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "scicrate_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "scicrate_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}

Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json

@@ -1,54 +1,45 @@
 {
-    "version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/85186a971453b0653bacfb3fae88f978dc1be689",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
     },
-    "states": [
-        {
-            "name": "scicratesecure",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "scicratesecure_door",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "scicratesecure_icon",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "welded",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "unlocked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "off",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "locked",
-            "select": [],
-            "flags": {}
-        },
-        {
-            "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
-        },
-        {
-            "name": "scicratesecure_open",
-            "select": [],
-            "flags": {}
-        }
-    ]
-}
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    }
+  ]
+}