EntityStorage ECS (#9291)

Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml

@@ -37,13 +37,14 @@
       mass: 5
       mask:
       - Impassable
-  - type: BodyBagEntityStorage
+  - type: EntityStorage
     Capacity: 1
     IsCollidableWhenOpen: true
     closeSound:
       path: /Audio/Misc/zip.ogg
     openSound:
       path: /Audio/Misc/zip.ogg
+  - type: EntityStorageLayingDownOverride
   - type: Foldable
   - type: PaperLabel
     labelSlot:
@@ -58,7 +59,12 @@
       state_open: open_overlay
     - type: FoldableVisualizer
       key: bag
-    - type: BodyBagVisualizer
+  - type: GenericVisualizer
+    visuals:
+      enum.PaperLabelVisuals.HasLabel:
+        enum.BodyBagVisualLayers.Label:
+          True: {visible: true}
+          False: {visible: false}
   - type: Pullable
   - type: AntiRottingContainer
 

Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml

@@ -38,8 +38,9 @@
     - type: Icon
       sprite: Structures/Storage/Crates/artifact.rsi
       state: artifact_container_icon
-    - type: ArtifactStorage
+    - type: EntityStorage
       Capacity: 1
+    - type: ArtifactStorage 
     - type: Weldable
     - type: SuppressArtifactContainer
     - type: PlaceableSurface

Resources/Prototypes/Entities/Structures/Storage/Closets/cursed.yml

@@ -6,3 +6,6 @@
   description: A standard-issue Nanotrasen storage unit.
   components:
   - type: CursedEntityStorage
+  - type: EntityStorage
+    closeSound:
+      path: /Audio/Effects/teleport_arrival.ogg

Resources/Prototypes/Entities/Structures/Storage/morgue.yml

@@ -9,6 +9,9 @@
     layers:
     - state: morgue_closed
       map: ["enum.MorgueVisualLayers.Base"]
+    - state: morgue_tray
+      offset: 0, -1
+      map: ["enum.StorageVisualLayers.Door"]
     - state: morgue_nomob_light
       visible: false
       map: ["enum.MorgueVisualLayers.Light"]
@@ -27,34 +30,41 @@
       - MachineMask
       layer:
       - WallLayer
-  - type: MorgueEntityStorage
+  - type: EntityStorage
     IsCollidableWhenOpen: true
+    showContents: false
     Capacity: 1
+    enteringOffset: 0, -1
     closeSound:
       path: /Audio/Items/deconstruct.ogg
     openSound:
       path: /Audio/Items/deconstruct.ogg
-    trayPrototype: MorgueTray
+  - type: EntityStorageLayingDownOverride
+  - type: Morgue
   - type: ContainerContainer
     containers:
       entity_storage: !type:Container
       morgue_tray: !type:ContainerSlot
   - type: Appearance
     visuals:
-    - type: MorgueVisualizer
-      state_open: morgue_open
-      state_closed: morgue_closed
-      light_contents: morgue_nomob_light
-      light_mob: morgue_nosoul_light
-      light_soul: morgue_soul_light
+    - type: StorageVisualizer
+      state: morgue_closed
+      state_alt: morgue_open
+      state_open: morgue_tray
+  - type: MorgueVisuals
+    lightContents: morgue_nomob_light
+    lightMob: morgue_nosoul_light
+    lightSoul: morgue_soul_light
   - type: Transform
     anchored: true
   - type: AntiRottingContainer
 
+#needs to be removed
 - type: entity
   id: MorgueTray
   name: morgue tray
   description: If you lay down to have a rest on this, you'll soon have a problem.
+  noSpawn: true
   components:
   - type: Physics
     bodyType: Static
@@ -70,10 +80,6 @@
     netsync: false
     sprite: Structures/Storage/morgue.rsi
     state: morgue_tray
-  - type: Clickable
-  - type: InteractionOutline
-  - type: MorgueTray
-  - type: AntiRottingContainer
 
 - type: entity
   id: Crematorium
@@ -86,6 +92,9 @@
     layers:
     - state: crema_closed
       map: ["enum.CrematoriumVisualLayers.Base"]
+    - state: crema_tray
+      offset: 0, -1
+      map: ["enum.StorageVisualLayers.Door"]
     - state: crema_contents_light
       visible: false
       map: ["enum.CrematoriumVisualLayers.Light"]
@@ -104,31 +113,37 @@
       - MachineMask
       layer:
       - MachineLayer
-  - type: CrematoriumEntityStorage
+  - type: EntityStorage
     IsCollidableWhenOpen: true
+    showContents: false
     Capacity: 1
+    enteringOffset: 0, -1
     closeSound:
       path: /Audio/Items/deconstruct.ogg
     openSound:
       path: /Audio/Items/deconstruct.ogg
-    trayPrototype: CrematoriumTray
-    doSoulBeep: false
+  - type: EntityStorageLayingDownOverride
+  - type: Crematorium
   - type: Appearance
     visuals:
-    - type: CrematoriumVisualizer
-      state_open: crema_open
-      state_closed: crema_closed
-      light_contents: crema_contents_light
-      light_burning: crema_active_light
+    - type: StorageVisualizer
+      state: crema_closed
+      state_alt: crema_open
+      state_open: crema_tray
+  - type: CrematoriumVisuals
+    lightContents: crema_contents_light
+    lightBurning: crema_active_light
   - type: Transform
     anchored: true
 
+#needs to be removed
 - type: entity
   id: CrematoriumTray
   name: crematorium tray
   parent: MorgueTray
+  noSpawn: true
   components:
   - type: Sprite
     netsync: false
     sprite: Structures/Storage/morgue.rsi
-    state: crema_tray
+    state: crema_tray