diff --git a/Resources/Locale/en-US/_NF/lathe/recipes.ftl b/Resources/Locale/en-US/_NF/lathe/recipes.ftl
index bf08e3ef3b3..8c4eb95c33f 100644
--- a/Resources/Locale/en-US/_NF/lathe/recipes.ftl
+++ b/Resources/Locale/en-US/_NF/lathe/recipes.ftl
@@ -21,4 +21,7 @@ lathe-recipe-NFFoodBoxPizza-name  = pizza box (empty)
 lathe-recipe-NFFoodBoxDonutEmpty-name  = donut box (empty)
 lathe-recipe-NFFoodBoxNuggetEmpty-name = chicken nuggets (empty)
 lathe-recipe-NFFoodContainerEggEmpty-name  = egg carton (empty)
-lathe-recipe-NFBoxMREEmpty-name = M.R.E. (empty)
\ No newline at end of file
+lathe-recipe-NFBoxMREEmpty-name = M.R.E. (empty)
+
+# Plastic
+lathe-recipe-NFFoodBoxSushi-name = sushi tray (empty)
\ No newline at end of file
diff --git a/Resources/Maps/_NF/POI/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml
index 6aceed30899..a95ffdd464f 100644
--- a/Resources/Maps/_NF/POI/grifty.yml
+++ b/Resources/Maps/_NF/POI/grifty.yml
@@ -24,11 +24,11 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: PgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAADbQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAABRwAAAAABRwAAAAADRwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAARwAAAAACRwAAAAACRwAAAAABRwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAARwAAAAAARwAAAAACRwAAAAAARwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAAARwAAAAABRwAAAAACRwAAAAAA
+          tiles: PgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAADbQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAABRwAAAAABRwAAAAADRwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAACRwAAAAACRwAAAAABRwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAAARwAAAAACRwAAAAAARwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAAARwAAAAABRwAAAAACRwAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAcwAAAAAAcwAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAACHgAAAAACHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAcwAAAAAAcwAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAADHgAAAAABHgAAAAACHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbQAAAAADbQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAbQAAAAAAbQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAcwAAAAAAcwAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAACHgAAAAACHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAcwAAAAAAcwAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAADHgAAAAABHgAAAAACHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbQAAAAADbQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAbQAAAAAAbQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -297,26 +297,25 @@ entities:
             0: 4097
           0,2:
             1: 1041
-            2: 51968
+            2: 19200
             3: 12
           -1,2:
-            1: 6152
+            1: 2056
             0: 19
-            2: 34560
+            2: 38656
           0,3:
             2: 65295
             1: 240
           -1,3:
-            2: 36622
+            2: 65294
             1: 241
           1,0:
             0: 65535
           1,1:
             0: 61422
           1,2:
-            2: 16128
+            2: 12032
             0: 14
-            1: 49152
           1,3:
             2: 65283
             1: 252
@@ -332,7 +331,7 @@ entities:
             0: 1
             2: 62208
           2,3:
-            2: 63239
+            2: 65295
             1: 240
           3,2:
             1: 61440
@@ -353,9 +352,8 @@ entities:
           -2,0:
             0: 65535
           -2,2:
-            2: 3600
+            2: 36624
             0: 142
-            1: 32768
           -3,3:
             1: 128
           -2,3:
@@ -728,6 +726,26 @@ entities:
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
+  - uid: 89
+    components:
+    - type: Transform
+      pos: -1.5,15.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -2.5,15.5
+      parent: 1
+  - uid: 599
+    components:
+    - type: Transform
+      pos: -7.5,10.5
+      parent: 1
+  - uid: 600
+    components:
+    - type: Transform
+      pos: -3.5,15.5
+      parent: 1
   - uid: 812
     components:
     - type: Transform
@@ -853,31 +871,11 @@ entities:
     - type: Transform
       pos: 8.5,11.5
       parent: 1
-  - uid: 844
-    components:
-    - type: Transform
-      pos: 7.5,11.5
-      parent: 1
-  - uid: 845
-    components:
-    - type: Transform
-      pos: 6.5,11.5
-      parent: 1
   - uid: 846
     components:
     - type: Transform
       pos: 5.5,11.5
       parent: 1
-  - uid: 847
-    components:
-    - type: Transform
-      pos: 4.5,11.5
-      parent: 1
-  - uid: 848
-    components:
-    - type: Transform
-      pos: 3.5,11.5
-      parent: 1
   - uid: 849
     components:
     - type: Transform
@@ -1552,6 +1550,11 @@ entities:
       parent: 1
 - proto: CableApcExtension
   entities:
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 11.5,13.5
+      parent: 1
   - uid: 134
     components:
     - type: Transform
@@ -1682,21 +1685,6 @@ entities:
     - type: Transform
       pos: 10.5,13.5
       parent: 1
-  - uid: 446
-    components:
-    - type: Transform
-      pos: 11.5,13.5
-      parent: 1
-  - uid: 447
-    components:
-    - type: Transform
-      pos: 12.5,13.5
-      parent: 1
-  - uid: 448
-    components:
-    - type: Transform
-      pos: 13.5,13.5
-      parent: 1
   - uid: 449
     components:
     - type: Transform
@@ -1944,6 +1932,11 @@ entities:
       parent: 1
 - proto: CableHV
   entities:
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -5.5,8.5
+      parent: 1
   - uid: 136
     components:
     - type: Transform
@@ -2054,11 +2047,6 @@ entities:
     - type: Transform
       pos: 9.5,12.5
       parent: 1
-  - uid: 159
-    components:
-    - type: Transform
-      pos: 10.5,12.5
-      parent: 1
   - uid: 160
     components:
     - type: Transform
@@ -2144,11 +2132,6 @@ entities:
     - type: Transform
       pos: 9.5,14.5
       parent: 1
-  - uid: 177
-    components:
-    - type: Transform
-      pos: 10.5,14.5
-      parent: 1
   - uid: 178
     components:
     - type: Transform
@@ -2194,6 +2177,16 @@ entities:
     - type: Transform
       pos: -6.5,6.5
       parent: 1
+  - uid: 518
+    components:
+    - type: Transform
+      pos: -4.5,8.5
+      parent: 1
+  - uid: 598
+    components:
+    - type: Transform
+      pos: -6.5,8.5
+      parent: 1
   - uid: 702
     components:
     - type: Transform
@@ -2256,12 +2249,6 @@ entities:
       parent: 1
 - proto: Catwalk
   entities:
-  - uid: 108
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,11.5
-      parent: 1
   - uid: 109
     components:
     - type: Transform
@@ -2376,12 +2363,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,13.5
       parent: 1
-  - uid: 129
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,13.5
-      parent: 1
   - uid: 130
     components:
     - type: Transform
@@ -2394,22 +2375,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,12.5
       parent: 1
-  - uid: 132
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,11.5
-      parent: 1
-  - uid: 133
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,11.5
-      parent: 1
-  - uid: 199
+  - uid: 159
     components:
     - type: Transform
-      pos: -3.5,11.5
+      pos: 10.5,13.5
       parent: 1
   - uid: 281
     components:
@@ -2717,70 +2686,13 @@ entities:
     - type: Transform
       pos: -1.5,0.5
       parent: 1
-- proto: DrinkAleBottleFull
-  entities:
-  - uid: 590
-    components:
-    - type: Transform
-      parent: 586
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 591
-    components:
-    - type: Transform
-      parent: 586
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 592
-    components:
-    - type: Transform
-      parent: 586
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: DrinkBeerBottleFull
-  entities:
-  - uid: 587
-    components:
-    - type: Transform
-      parent: 586
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 589
-    components:
-    - type: Transform
-      parent: 586
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 593
-    components:
-    - type: Transform
-      parent: 586
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: DrinkChampagneBottleFull
-  entities:
-  - uid: 602
-    components:
-    - type: Transform
-      parent: 595
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: DrinkCreamCarton
+- proto: DogBed
   entities:
-  - uid: 515
+  - uid: 557
     components:
     - type: Transform
-      parent: 512
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: -9.5,3.5
+      parent: 1
 - proto: DrinkEnergyDrinkCan
   entities:
   - uid: 698
@@ -2801,47 +2713,6 @@ entities:
             Quantity: 25
     - type: Openable
       opened: True
-- proto: DrinkGildlagerBottleFull
-  entities:
-  - uid: 594
-    components:
-    - type: Transform
-      parent: 586
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: DrinkGinBottleFull
-  entities:
-  - uid: 596
-    components:
-    - type: Transform
-      parent: 595
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 598
-    components:
-    - type: Transform
-      parent: 595
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 600
-    components:
-    - type: Transform
-      parent: 595
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: DrinkMilkCarton
-  entities:
-  - uid: 516
-    components:
-    - type: Transform
-      parent: 512
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: DrinkNuclearColaGlass
   entities:
   - uid: 711
@@ -2859,65 +2730,6 @@ entities:
     - type: Transform
       pos: 7.365638,4.4086084
       parent: 1
-- proto: DrinkOatMilkCarton
-  entities:
-  - uid: 517
-    components:
-    - type: Transform
-      parent: 512
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: DrinkRumBottleFull
-  entities:
-  - uid: 597
-    components:
-    - type: Transform
-      parent: 595
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 599
-    components:
-    - type: Transform
-      parent: 595
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 601
-    components:
-    - type: Transform
-      parent: 595
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: DrinkSoyMilkCarton
-  entities:
-  - uid: 514
-    components:
-    - type: Transform
-      parent: 512
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: DrinkVermouthBottleFull
-  entities:
-  - uid: 588
-    components:
-    - type: Transform
-      parent: 586
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: EggBoxBroken
-  entities:
-  - uid: 519
-    components:
-    - type: Transform
-      parent: 512
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: EmergencyLight
   entities:
   - uid: 768
@@ -3149,15 +2961,6 @@ entities:
     - type: Transform
       pos: -2.3975186,2.7845416
       parent: 1
-- proto: FoodContainerEgg
-  entities:
-  - uid: 513
-    components:
-    - type: Transform
-      parent: 512
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: FoodDonkpocketHonk
   entities:
   - uid: 561
@@ -3165,15 +2968,6 @@ entities:
     - type: Transform
       pos: -0.22007972,5.7634063
       parent: 1
-- proto: FoodMeatRotten
-  entities:
-  - uid: 518
-    components:
-    - type: Transform
-      parent: 512
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: GasCanisterBrokenBase
   entities:
   - uid: 231
@@ -3186,20 +2980,26 @@ entities:
     - type: Transform
       pos: 13.5,12.5
       parent: 1
-- proto: GasFilterFlipped
+- proto: GasFilterNitrogenOn
   entities:
   - uid: 371
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,10.5
+      pos: 2.5,10.5
       parent: 1
-  - uid: 372
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasFilterOxygenOn
+  entities:
+  - uid: 363
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 2.5,10.5
+      pos: -0.5,10.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasMixerOn
   entities:
   - uid: 106
@@ -3211,6 +3011,16 @@ entities:
     - type: GasMixer
       inletTwoConcentration: 0.79
       inletOneConcentration: 0.21
+- proto: GasMixerOnFlipped
+  entities:
+  - uid: 372
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
 - proto: GasOutletInjector
   entities:
   - uid: 239
@@ -3237,21 +3047,29 @@ entities:
     - type: Transform
       pos: 3.5,8.5
       parent: 1
-  - uid: 363
+  - uid: 384
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,10.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,10.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
 - proto: GasPipeBend
   entities:
+  - uid: 42
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 202
     components:
     - type: Transform
       pos: 13.5,15.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 234
     components:
     - type: Transform
@@ -3320,30 +3138,30 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,5.5
       parent: 1
-  - uid: 383
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,10.5
-      parent: 1
-  - uid: 384
+  - uid: 377
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 8.5,11.5
+      pos: -4.5,15.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 398
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 13.5,11.5
       parent: 1
-  - uid: 720
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 513
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 6.5,15.5
+      pos: -5.5,10.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeStraight
   entities:
   - uid: 14
@@ -3352,6 +3170,27 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,9.5
       parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 10.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 10.5,14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 10.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 233
     components:
     - type: Transform
@@ -3726,14 +3565,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 362
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 364
     components:
     - type: Transform
@@ -3783,18 +3614,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 377
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,10.5
-      parent: 1
   - uid: 381
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,10.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,15.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 386
     components:
     - type: Transform
@@ -3811,30 +3638,190 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 617
+  - uid: 446
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 447
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 448
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 512
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 514
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 515
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 516
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 517
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 6.5,14.5
+      pos: -5.5,8.5
       parent: 1
-  - uid: 708
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 519
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 587
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 588
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 589
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 590
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 591
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 592
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 593
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 594
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 595
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 596
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 597
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 602
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 6.5,13.5
+      pos: -4.5,12.5
       parent: 1
-  - uid: 713
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 617
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 6.5,12.5
+      pos: -4.5,13.5
       parent: 1
-  - uid: 719
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 648
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 6.5,11.5
+      pos: -4.5,14.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 723
     components:
     - type: Transform
@@ -3853,13 +3840,6 @@ entities:
       color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 42
-    components:
-    - type: Transform
-      pos: -5.5,10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 254
     components:
     - type: Transform
@@ -3925,8 +3905,10 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 6.5,10.5
+      pos: -4.5,10.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 726
     components:
     - type: Transform
@@ -3950,12 +3932,16 @@ entities:
     - type: Transform
       pos: 13.5,12.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 223
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 13.5,14.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 310
     components:
     - type: Transform
@@ -3966,12 +3952,6 @@ entities:
       color: '#0055CCFF'
 - proto: GasPressurePump
   entities:
-  - uid: 196
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,15.5
-      parent: 1
   - uid: 242
     components:
     - type: Transform
@@ -3992,12 +3972,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 557
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,11.5
-      parent: 1
 - proto: GasPressurePumpOn
   entities:
   - uid: 324
@@ -4005,16 +3979,23 @@ entities:
     - type: Transform
       pos: 3.5,6.5
       parent: 1
-- proto: GasPressurePumpOnMax
+- proto: GasValve
   entities:
-  - uid: 232
+  - uid: 383
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,8.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,10.5
       parent: 1
+  - uid: 601
+    components:
+    - type: Transform
+      pos: -4.5,11.5
+      parent: 1
+    - type: GasValve
+      open: False
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#03FCD3FF'
 - proto: GasVentPump
   entities:
   - uid: 238
@@ -4275,175 +4256,13 @@ entities:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,9.5
-      parent: 1
-- proto: GunSafe
-  entities:
-  - uid: 563
-    components:
-    - type: Transform
-      pos: -5.5,6.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1497
-        moles:
-        - 0.1517475
-        - 0.57085973
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 296
-          - 528
-          - 388
-          - 219
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: HospitalCurtains
-  entities:
-  - uid: 492
-    components:
-    - type: Transform
-      pos: -8.5,7.5
-      parent: 1
-    - type: Door
-      secondsUntilStateChange: -6181.815
-      state: Opening
-- proto: Lamp
-  entities:
-  - uid: 564
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.58854175,6.107703
-      parent: 1
-- proto: LightBulbBroken
-  entities:
-  - uid: 666
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.89151,6.8016806
-      parent: 1
-  - uid: 816
-    components:
-    - type: Transform
-      parent: 815
-    - type: Physics
-      canCollide: False
-- proto: LightTubeBroken
-  entities:
-  - uid: 632
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.16488624,6.033028
-      parent: 1
-- proto: LockerBooze
-  entities:
-  - uid: 586
-    components:
-    - type: Transform
-      pos: 7.5,8.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14972
-        moles:
-        - 1.8968438
-        - 7.1357465
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 591
-          - 592
-          - 593
-          - 594
-          - 587
-          - 588
-          - 589
-          - 590
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-  - uid: 595
-    components:
-    - type: Transform
-      pos: 6.5,8.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14972
-        moles:
-        - 1.8968438
-        - 7.1357465
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 602
-          - 596
-          - 597
-          - 598
-          - 599
-          - 600
-          - 601
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: LockerFreezerBase
+      parent: 1
+- proto: GunSafe
   entities:
-  - uid: 512
+  - uid: 563
     components:
     - type: Transform
-      pos: 2.5,3.5
+      pos: -5.5,6.5
       parent: 1
     - type: EntityStorage
       air:
@@ -4451,8 +4270,8 @@ entities:
         immutable: False
         temperature: 293.1497
         moles:
-        - 1.8968438
-        - 7.1357465
+        - 0.1517475
+        - 0.57085973
         - 0
         - 0
         - 0
@@ -4469,17 +4288,68 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 513
-          - 514
-          - 515
-          - 516
-          - 517
-          - 518
-          - 519
+          - 296
+          - 528
+          - 388
+          - 219
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
           ent: null
+- proto: HospitalCurtains
+  entities:
+  - uid: 492
+    components:
+    - type: Transform
+      pos: -8.5,7.5
+      parent: 1
+    - type: Door
+      secondsUntilStateChange: -7255.033
+      state: Opening
+- proto: Lamp
+  entities:
+  - uid: 564
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.58854175,6.107703
+      parent: 1
+- proto: LightBulbBroken
+  entities:
+  - uid: 666
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.89151,6.8016806
+      parent: 1
+  - uid: 816
+    components:
+    - type: Transform
+      parent: 815
+    - type: Physics
+      canCollide: False
+- proto: LightTubeBroken
+  entities:
+  - uid: 632
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.16488624,6.033028
+      parent: 1
+- proto: LockerBoozeFilled
+  entities:
+  - uid: 199
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 1
+- proto: LockerFreezerSushi
+  entities:
+  - uid: 362
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
 - proto: LogicGateOr
   entities:
   - uid: 755
@@ -4548,90 +4418,6 @@ entities:
     - type: Transform
       pos: -0.62397563,5.3686275
       parent: 1
-- proto: RandomPosterContrabandDeadDrop
-  entities:
-  - uid: 579
-    components:
-    - type: Transform
-      pos: -4.5,4.5
-      parent: 1
-  - uid: 44
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-1.5
-      parent: 1
-  - uid: 570
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 1
-  - uid: 809
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 1
-  - uid: 811
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,1.5
-      parent: 1
-  - uid: 551
-    components:
-    - type: Transform
-      pos: 3.5,4.5
-      parent: 1
-  - uid: 583
-    components:
-    - type: Transform
-      pos: 4.5,-0.5
-      parent: 1
-  - uid: 582
-    components:
-    - type: Transform
-      pos: 4.5,4.5
-      parent: 1
-  - uid: 630
-    components:
-    - type: Transform
-      pos: -5.5,9.5
-      parent: 1
-  - uid: 584
-    components:
-    - type: Transform
-      pos: 5.5,9.5
-      parent: 1
-  - uid: 585
-    components:
-    - type: Transform
-      pos: 8.5,9.5
-      parent: 1
-  - uid: 611
-    components:
-    - type: Transform
-      pos: 10.5,6.5
-      parent: 1
-  - uid: 573
-    components:
-    - type: Transform
-      pos: 10.5,1.5
-      parent: 1
-  - uid: 715
-    components:
-    - type: Transform
-      pos: 4.5,5.5
-      parent: 1
-  - uid: 615
-    components:
-    - type: Transform
-      pos: 9.5,8.5
-      parent: 1
-  - uid: 609
-    components:
-    - type: Transform
-      pos: 8.5,-2.5
-      parent: 1
 - proto: PosterLegitCarpMount
   entities:
   - uid: 728
@@ -4723,10 +4509,11 @@ entities:
       parent: 1
 - proto: PoweredLightPostSmall
   entities:
-  - uid: 668
+  - uid: 132
     components:
     - type: Transform
-      pos: 14.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 11.5,12.5
       parent: 1
   - uid: 669
     components:
@@ -4855,6 +4642,13 @@ entities:
     - type: Transform
       pos: 1.5,0.5
       parent: 1
+- proto: RailingCorner
+  entities:
+  - uid: 586
+    components:
+    - type: Transform
+      pos: -9.5,3.5
+      parent: 1
 - proto: RandomCargoCorpseSpawner
   entities:
   - uid: 741
@@ -4862,6 +4656,90 @@ entities:
     - type: Transform
       pos: -1.5,5.5
       parent: 1
+- proto: RandomPosterContrabandDeadDrop
+  entities:
+  - uid: 44
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-1.5
+      parent: 1
+  - uid: 551
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 1
+  - uid: 570
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 1
+  - uid: 579
+    components:
+    - type: Transform
+      pos: -4.5,4.5
+      parent: 1
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 583
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 584
+    components:
+    - type: Transform
+      pos: 5.5,9.5
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 8.5,9.5
+      parent: 1
+  - uid: 609
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 1
+  - uid: 611
+    components:
+    - type: Transform
+      pos: 10.5,6.5
+      parent: 1
+  - uid: 615
+    components:
+    - type: Transform
+      pos: 9.5,8.5
+      parent: 1
+  - uid: 630
+    components:
+    - type: Transform
+      pos: -5.5,9.5
+      parent: 1
+  - uid: 715
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+  - uid: 809
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 811
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,1.5
+      parent: 1
 - proto: RandomSoap
   entities:
   - uid: 765
@@ -5113,12 +4991,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,14.5
       parent: 1
-  - uid: 89
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,14.5
-      parent: 1
   - uid: 91
     components:
     - type: Transform
@@ -5163,12 +5035,6 @@ entities:
       parent: 1
 - proto: SolarPanelBroken
   entities:
-  - uid: 73
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,12.5
-      parent: 1
   - uid: 74
     components:
     - type: Transform
@@ -5579,6 +5445,11 @@ entities:
     - type: Transform
       pos: 8.5,8.5
       parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 7.5,8.5
+      parent: 1
 - proto: VendingMachineCoffee
   entities:
   - uid: 780
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/food.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/food.yml
new file mode 100644
index 00000000000..baecee04baf
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/food.yml
@@ -0,0 +1,9 @@
+- type: entity
+  id: LockerFreezerSushi
+  parent: LockerFreezerBase
+  suffix: Filled, Sushi
+  components:
+  - type: StorageFill
+    contents:
+    - id: FoodBoxSushiBad
+      amount: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
index ea4811a3ff8..7044313bb49 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -214,6 +214,132 @@
 #    - id: FoodCondimentPacketPepper
     - id: FoodCondimentPacketSalt
 
+- type: entity
+  parent: [BaseStorageItem, BaseBagOpenClose]
+  id: FoodBoxSushi
+  name: sushi tray
+  description: Plastic sushi container with lid.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/sushi.rsi
+    scale: 0.8, 0.8
+    state: tray
+    layers:
+    - state: tray
+    - state: goodtray6
+      map: ["tray6"]
+      visible: false
+    - state: goodtray5
+      map: ["tray5"]
+      visible: false
+    - state: goodtray4
+      map: ["tray4"]
+      visible: false
+    - state: goodtray3
+      map: ["tray3"]
+      visible: false
+    - state: goodtray2
+      map: ["tray2"]
+      visible: false
+    - state: goodtray1
+      map: ["tray1"]
+      visible: false
+    - state: label
+      map: ["closeLayer"]
+      visible: false
+  - type: Item
+    sprite: _NF/Objects/Consumable/Food/sushi.rsi
+    size: Normal
+    inhandVisuals:
+      left:
+      - state: tray-inhand-left
+      right:
+      - state: tray-inhand-right
+  - type: Storage
+    grid:
+    - 0,0,1,2
+    whitelist:
+      tags:
+        - Sushi
+    storageOpenSound: /Audio/Effects/packetrip.ogg
+    hideStackVisualsWhenClosed: false
+  - type: ItemCounter
+    count:
+      tags: [Sushi]
+    composite: true
+    layerStates:
+    - tray1
+    - tray2
+    - tray3
+    - tray4
+    - tray5
+    - tray6
+
+- type: entity
+  parent: FoodBoxSushi
+  id: FoodBoxSushiBad
+  suffix: Bad
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/sushi.rsi
+    scale: 0.8, 0.8
+    state: tray
+    layers:
+    - state: tray
+    - state: tray6
+      map: ["tray6"]
+      visible: false
+    - state: tray5
+      map: ["tray5"]
+      visible: false
+    - state: tray4
+      map: ["tray4"]
+      visible: false
+    - state: tray3
+      map: ["tray3"]
+      visible: false
+    - state: tray2
+      map: ["tray2"]
+      visible: false
+    - state: tray1
+      map: ["tray1"]
+      visible: false
+    - state: label
+      map: ["closeLayer"]
+      visible: false
+  - type: StorageFill
+    contents:
+    # Slice1
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice1
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice1
+    # Slice2
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice2
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice2
+    # Slice3
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice3
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice3
+    # Slice4
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice4
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice4
+    # Slice5
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice5
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice5
+    # Slice6
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice6
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice6
+
 # Empty
 - type: entity
   id: BoxMREEmpty
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/sushi.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/sushi.yml
index cce090808ab..c90c4e71449 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/sushi.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/sushi.yml
@@ -1,6 +1,16 @@
+- type: entity
+  id: FoodBaseSushi
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/sushi.rsi
+  - type: Tag
+    tags:
+      - Sushi
+
 - type: entity
   name: avocado sushi
-  parent: FoodMealBase
+  parent: [FoodBaseSushi, FoodMealBase]
   id: FoodMealAvocadoSushi
   description: Where did the seaweed come from?
   components:
@@ -9,26 +19,23 @@
       - cucumber
       - avocado
   - type: Sprite
-    sprite: _NF/Objects/Consumable/Food/sushi.rsi
     state: avocadosushi
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 40
+        maxVol: 42
         reagents:
         - ReagentId: Nutriment
-          Quantity: 20
-        - ReagentId: Flavorol
-          Quantity: 10
+          Quantity: 30
         - ReagentId: CucumberWater
-          Quantity: 2
+          Quantity: 3
   - type: SliceableFood
-    count: 5
+    count: 6
     slice: FoodMealAvocadoSushiSlice
 
 - type: entity
   name: avocado sushi
-  parent: FoodInjectableBase
+  parent: [FoodBaseSushi, FoodInjectableBase]
   id: FoodMealAvocadoSushiSlice
   description: Where did the seaweed come from?
   components:
@@ -37,23 +44,22 @@
       - cucumber
       - avocado
   - type: Sprite
-    sprite: _NF/Objects/Consumable/Food/sushi.rsi
     state: avocadosushislice
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 8
+        maxVol: 7
         reagents:
         - ReagentId: Nutriment
-          Quantity: 4
-        - ReagentId: Flavorol
-          Quantity: 2
+          Quantity: 5
         - ReagentId: CucumberWater
-          Quantity: .4
+          Quantity: .5
+  - type: Item
+    size: Tiny
 
 - type: entity
   name: carp sushi
-  parent: FoodMealBase
+  parent: [FoodBaseSushi, FoodMealBase]
   id: FoodMealCarpSushi
   description: Certainly worth the risk.
   components:
@@ -62,28 +68,25 @@
       - cucumber
       - fishy
   - type: Sprite
-    sprite: _NF/Objects/Consumable/Food/sushi.rsi
     state: carpsushi
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 45
+        maxVol: 48
         reagents:
         - ReagentId: Nutriment
-          Quantity: 20
-        - ReagentId: Flavorol
-          Quantity: 10
+          Quantity: 30
         - ReagentId: CarpoToxin
-          Quantity: 5
+          Quantity: 6
         - ReagentId: CucumberWater
-          Quantity: 2
+          Quantity: 3
   - type: SliceableFood
-    count: 5
+    count: 6
     slice: FoodMealCarpSushiSlice
 
 - type: entity
   name: carp sushi
-  parent: FoodInjectableBase
+  parent: [FoodBaseSushi, FoodInjectableBase]
   id: FoodMealCarpSushiSlice
   description: Certainly worth the smaller risk.
   components:
@@ -92,18 +95,54 @@
       - cucumber
       - fishy
   - type: Sprite
-    sprite: _NF/Objects/Consumable/Food/sushi.rsi
     state: carpsushislice
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 9
+        maxVol: 8
         reagents:
         - ReagentId: Nutriment
-          Quantity: 4
-        - ReagentId: Flavorol
-          Quantity: 2
+          Quantity: 5
         - ReagentId: CarpoToxin
           Quantity: 1
         - ReagentId: CucumberWater
-          Quantity: .4
+          Quantity: .5
+  - type: Item
+    size: Tiny
+
+- type: entity
+  name: gas station sushi
+  parent: [FoodBaseSushi, FoodInjectableBase]
+  id: FoodMealGasSafeSushiSlice
+  suffix: Safe
+  description: Is it worth the risk?
+  components:
+  - type: FlavorProfile
+    flavors:
+      - fishy
+      - cheap
+      - bitter
+  - type: Sprite
+    state: gassushislice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+  - type: Item
+    size: Tiny
+
+- type: entity
+  parent: [FoodBaseSushi, FoodMealGasSafeSushiSlice]
+  id: FoodMealGasBadSushiSlice
+  suffix: Bad
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GastroToxin
+          Quantity: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index fb4c43a96eb..8f5313c36df 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -165,6 +165,7 @@
       - NFFoodBoxDonutEmpty
       - NFFoodBoxNuggetEmpty
       - NFFoodContainerEggEmpty
+      - NFFoodBoxSushi
     ## Basic parts
       - CableStack
       - LightTube
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml b/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
index e6160efaf7d..17545263093 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
@@ -179,4 +179,14 @@
   completetime: 1
   applyMaterialDiscount: false
   materials:
-    Cardboard: 100
\ No newline at end of file
+    Cardboard: 100
+
+- type: latheRecipe
+  id: NFFoodBoxSushi
+  result: FoodBoxSushi
+  name: lathe-recipe-NFFoodBoxSushi-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Plastic: 100
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
index 491db209224..9697ef10bf9 100644
--- a/Resources/Prototypes/_NF/tags.yml
+++ b/Resources/Prototypes/_NF/tags.yml
@@ -95,4 +95,7 @@
   id: SmallThrusterMachineCircuitboard
 
 - type: Tag
-  id: BrassKnucklesNF
\ No newline at end of file
+  id: BrassKnucklesNF
+
+- type: Tag
+  id: Sushi
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/gassushislice.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/gassushislice.png
new file mode 100644
index 00000000000..e542d017a6c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/gassushislice.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray1.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray1.png
new file mode 100644
index 00000000000..5f11caaf73a
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray1.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray2.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray2.png
new file mode 100644
index 00000000000..8f2b894f2f3
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray2.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray3.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray3.png
new file mode 100644
index 00000000000..0a4b81d019e
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray3.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray4.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray4.png
new file mode 100644
index 00000000000..0328e2fa98c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray4.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray5.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray5.png
new file mode 100644
index 00000000000..3a6e5b2f77c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray5.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray6.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray6.png
new file mode 100644
index 00000000000..0dc0db12b9b
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray6.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/label.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/label.png
new file mode 100644
index 00000000000..b928ba13948
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/label.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/meta.json
index 05ac3dffde8..4c4823f3288 100644
--- a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/meta.json
@@ -1,12 +1,63 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "clurger created by gentlebutter (Discord), rosy-mothroach made by TurboTracker, edited by Whatstone",
+  "copyright": "carpsushi, carpsushislice created by gentlebutter (Discord), avocadosushi, avocadosushislice edited by dustylens (GitHub)",
+  "copyright": "tray, tray1-6, gassushislice made by matthewbadger (Discord), label, tray-inhand*, goodtray1-6 made by whatston3 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
+    {
+      "name": "tray1"
+    },
+    {
+      "name": "tray2"
+    },
+    {
+      "name": "tray3"
+    },
+    {
+      "name": "tray4"
+    },
+    {
+      "name": "tray5"
+    },
+    {
+      "name": "tray6"
+    },
+    {
+      "name": "goodtray1"
+    },
+    {
+      "name": "goodtray2"
+    },
+    {
+      "name": "goodtray3"
+    },
+    {
+      "name": "goodtray4"
+    },
+    {
+      "name": "goodtray5"
+    },
+    {
+      "name": "goodtray6"
+    },
+    {
+      "name": "tray"
+    },
+    {
+      "name": "label"
+    },
+    {
+      "name": "tray-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "tray-inhand-left",
+      "directions": 4
+    },
     {
       "name": "avocadosushi"
     },
@@ -19,6 +70,9 @@
     {
       "name": "carpsushislice"
     },
+    {
+      "name": "gassushislice"
+    },
     {
       "name": "inhand-right",
       "directions": 4
@@ -26,6 +80,6 @@
     {
       "name": "inhand-left",
       "directions": 4
-    }    
+    }
   ]
 }
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-left.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-left.png
new file mode 100644
index 00000000000..d2d8b0a2d2d
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-right.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-right.png
new file mode 100644
index 00000000000..9b87372bb30
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray.png
new file mode 100644
index 00000000000..5e030e98734
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray1.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray1.png
new file mode 100644
index 00000000000..10c9fc1896a
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray1.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray2.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray2.png
new file mode 100644
index 00000000000..4a030290379
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray2.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray3.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray3.png
new file mode 100644
index 00000000000..7a19f376b4c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray3.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray4.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray4.png
new file mode 100644
index 00000000000..a29cf42d0aa
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray4.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray5.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray5.png
new file mode 100644
index 00000000000..2d75f219a7a
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray5.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray6.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray6.png
new file mode 100644
index 00000000000..039b368da6c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray6.png differ