diff --git a/Resources/Maps/_NF/POI/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml
index 9061254a08d..0f38ee5587a 100644
--- a/Resources/Maps/_NF/POI/grifty.yml
+++ b/Resources/Maps/_NF/POI/grifty.yml
@@ -289,31 +289,40 @@ entities:
           0,0:
             0: 65535
           0,1:
-            0: 65535
+            0: 57359
+            1: 8176
           1,0:
             0: 65535
           1,1:
             0: 65535
           1,2:
-            0: 65535
+            0: 255
+            1: 65280
           2,0:
-            0: 30583
+            0: 30579
+            1: 4
           2,1:
-            0: 30583
+            0: 14199
+            1: 16384
           2,2:
-            0: 62259
+            0: 51
+            1: 62208
           -2,0:
             0: 65535
           -2,1:
-            0: 65535
+            0: 61727
+            1: 3808
           -2,2:
-            0: 36607
+            0: 255
+            1: 36352
           -1,0:
             0: 65535
           -1,1:
-            0: 65535
+            0: 61455
+            1: 4080
           -1,2:
-            0: 40959
+            0: 247
+            1: 40712
           0,-1:
             0: 61440
           1,-2:
@@ -333,27 +342,30 @@ entities:
           -1,-1:
             0: 63351
           0,2:
-            0: 53247
+            1: 53009
+            0: 238
           0,3:
-            0: 65535
+            1: 65535
           1,3:
-            0: 65535
+            1: 65535
           2,3:
-            0: 63479
+            1: 63479
           3,2:
-            0: 61440
+            1: 61440
           3,3:
-            0: 65535
+            1: 65535
           -3,1:
-            0: 61166
+            0: 52974
+            1: 8192
           -3,3:
-            0: 128
+            1: 128
           -2,3:
-            0: 36863
+            1: 36863
           -1,3:
-            0: 36863
+            1: 36863
           -3,0:
-            0: 61166
+            1: 2
+            0: 61164
           -3,2:
             0: 204
           -3,-2:
@@ -376,6 +388,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -473,189 +500,956 @@ entities:
   - uid: 406
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,7.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 756
+    - type: DeviceLinkSource
+      linkedPorts:
+        755:
+        - DoorStatus: InputA
+- proto: AirlockGlass
+  entities:
+  - uid: 7
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      pos: -7.5,-0.5
+      parent: 1
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -6.5,-0.5
+      parent: 1
+  - uid: 378
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 379
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 380
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 1
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 606
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 610
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 612
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 620
+    components:
+    - type: Transform
+      pos: 7.5,-6.5
+      parent: 1
+  - uid: 621
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-5.5
+      parent: 1
+  - uid: 622
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 623
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-3.5
+      parent: 1
+  - uid: 794
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-3.5
+      parent: 1
+  - uid: 795
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-4.5
+      parent: 1
+  - uid: 796
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-5.5
+      parent: 1
+  - uid: 797
+    components:
+    - type: Transform
+      pos: -7.5,-6.5
+      parent: 1
+  - uid: 798
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 1
+- proto: APCBasic
+  entities:
+  - uid: 414
+    components:
+    - type: Transform
+      pos: -2.5,7.5
+      parent: 1
+  - uid: 415
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 734
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 1
+  - uid: 739
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 743
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 1
+  - uid: 744
+    components:
+    - type: Transform
+      pos: 7.5,-6.5
+      parent: 1
+  - uid: 745
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 746
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 803
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 1
+  - uid: 804
+    components:
+    - type: Transform
+      pos: -7.5,-6.5
+      parent: 1
+  - uid: 805
+    components:
+    - type: Transform
+      pos: -8.5,-5.5
+      parent: 1
+  - uid: 806
+    components:
+    - type: Transform
+      pos: -8.5,-4.5
+      parent: 1
+  - uid: 807
+    components:
+    - type: Transform
+      pos: -8.5,-3.5
+      parent: 1
+- proto: AtmosFixBlockerMarker
+  entities:
+  - uid: 812
+    components:
+    - type: Transform
+      pos: 14.5,14.5
+      parent: 1
+  - uid: 819
+    components:
+    - type: Transform
+      pos: 15.5,14.5
+      parent: 1
+  - uid: 821
+    components:
+    - type: Transform
+      pos: -6.5,10.5
+      parent: 1
+  - uid: 822
+    components:
+    - type: Transform
+      pos: 13.5,14.5
+      parent: 1
+  - uid: 823
+    components:
+    - type: Transform
+      pos: 13.5,13.5
+      parent: 1
+  - uid: 824
+    components:
+    - type: Transform
+      pos: 14.5,13.5
+      parent: 1
+  - uid: 825
+    components:
+    - type: Transform
+      pos: 15.5,13.5
+      parent: 1
+  - uid: 826
+    components:
+    - type: Transform
+      pos: 15.5,12.5
+      parent: 1
+  - uid: 827
+    components:
+    - type: Transform
+      pos: 12.5,11.5
+      parent: 1
+  - uid: 828
+    components:
+    - type: Transform
+      pos: 12.5,12.5
+      parent: 1
+  - uid: 829
+    components:
+    - type: Transform
+      pos: 12.5,13.5
+      parent: 1
+  - uid: 830
+    components:
+    - type: Transform
+      pos: 12.5,14.5
+      parent: 1
+  - uid: 831
+    components:
+    - type: Transform
+      pos: 12.5,15.5
+      parent: 1
+  - uid: 832
+    components:
+    - type: Transform
+      pos: 13.5,15.5
+      parent: 1
+  - uid: 833
+    components:
+    - type: Transform
+      pos: 14.5,15.5
+      parent: 1
+  - uid: 834
+    components:
+    - type: Transform
+      pos: 15.5,15.5
+      parent: 1
+  - uid: 835
+    components:
+    - type: Transform
+      pos: 14.5,12.5
+      parent: 1
+  - uid: 836
+    components:
+    - type: Transform
+      pos: 13.5,12.5
+      parent: 1
+  - uid: 837
+    components:
+    - type: Transform
+      pos: 13.5,11.5
+      parent: 1
+  - uid: 838
+    components:
+    - type: Transform
+      pos: 14.5,11.5
+      parent: 1
+  - uid: 839
+    components:
+    - type: Transform
+      pos: 15.5,11.5
+      parent: 1
+  - uid: 840
+    components:
+    - type: Transform
+      pos: 11.5,11.5
+      parent: 1
+  - uid: 841
+    components:
+    - type: Transform
+      pos: 10.5,11.5
+      parent: 1
+  - uid: 842
+    components:
+    - type: Transform
+      pos: 9.5,11.5
+      parent: 1
+  - uid: 843
+    components:
+    - 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
+      pos: 2.5,11.5
+      parent: 1
+  - uid: 850
+    components:
+    - type: Transform
+      pos: 9.5,10.5
+      parent: 1
+  - uid: 851
+    components:
+    - type: Transform
+      pos: 8.5,10.5
+      parent: 1
+  - uid: 852
+    components:
+    - type: Transform
+      pos: 7.5,10.5
+      parent: 1
+  - uid: 853
+    components:
+    - type: Transform
+      pos: 6.5,10.5
+      parent: 1
+  - uid: 854
+    components:
+    - type: Transform
+      pos: 5.5,10.5
+      parent: 1
+  - uid: 855
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 1
+  - uid: 856
+    components:
+    - type: Transform
+      pos: 3.5,10.5
+      parent: 1
+  - uid: 857
+    components:
+    - type: Transform
+      pos: 2.5,10.5
+      parent: 1
+  - uid: 858
+    components:
+    - type: Transform
+      pos: 1.5,10.5
+      parent: 1
+  - uid: 859
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 1
+  - uid: 860
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 1
+  - uid: 861
+    components:
+    - type: Transform
+      pos: -1.5,10.5
+      parent: 1
+  - uid: 862
+    components:
+    - type: Transform
+      pos: -2.5,10.5
+      parent: 1
+  - uid: 863
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
+  - uid: 864
+    components:
+    - type: Transform
+      pos: -4.5,10.5
+      parent: 1
+  - uid: 865
+    components:
+    - type: Transform
+      pos: -5.5,10.5
+      parent: 1
+  - uid: 866
+    components:
+    - type: Transform
+      pos: -4.5,11.5
+      parent: 1
+  - uid: 867
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 868
+    components:
+    - type: Transform
+      pos: -3.5,12.5
+      parent: 1
+  - uid: 869
+    components:
+    - type: Transform
+      pos: -4.5,12.5
+      parent: 1
+  - uid: 870
+    components:
+    - type: Transform
+      pos: -5.5,12.5
+      parent: 1
+  - uid: 871
+    components:
+    - type: Transform
+      pos: -6.5,12.5
+      parent: 1
+  - uid: 872
+    components:
+    - type: Transform
+      pos: -7.5,12.5
+      parent: 1
+  - uid: 873
+    components:
+    - type: Transform
+      pos: -7.5,13.5
+      parent: 1
+  - uid: 874
+    components:
+    - type: Transform
+      pos: -8.5,13.5
+      parent: 1
+  - uid: 875
+    components:
+    - type: Transform
+      pos: -7.5,14.5
+      parent: 1
+  - uid: 876
+    components:
+    - type: Transform
+      pos: -6.5,14.5
+      parent: 1
+  - uid: 877
+    components:
+    - type: Transform
+      pos: -6.5,13.5
+      parent: 1
+  - uid: 878
+    components:
+    - type: Transform
+      pos: -5.5,13.5
+      parent: 1
+  - uid: 879
+    components:
+    - type: Transform
+      pos: -5.5,14.5
+      parent: 1
+  - uid: 880
+    components:
+    - type: Transform
+      pos: -4.5,14.5
+      parent: 1
+  - uid: 881
+    components:
+    - type: Transform
+      pos: -4.5,13.5
+      parent: 1
+  - uid: 882
+    components:
+    - type: Transform
+      pos: -4.5,15.5
+      parent: 1
+  - uid: 883
+    components:
+    - type: Transform
+      pos: -3.5,14.5
+      parent: 1
+  - uid: 884
+    components:
+    - type: Transform
+      pos: -3.5,13.5
+      parent: 1
+  - uid: 885
+    components:
+    - type: Transform
+      pos: -2.5,13.5
+      parent: 1
+  - uid: 886
+    components:
+    - type: Transform
+      pos: -2.5,14.5
+      parent: 1
+  - uid: 887
+    components:
+    - type: Transform
+      pos: -1.5,14.5
+      parent: 1
+  - uid: 888
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 1
+  - uid: 889
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 1
+  - uid: 890
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 1
+  - uid: 891
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1
+  - uid: 892
+    components:
+    - type: Transform
+      pos: 3.5,14.5
+      parent: 1
+  - uid: 893
+    components:
+    - type: Transform
+      pos: 4.5,14.5
+      parent: 1
+  - uid: 894
+    components:
+    - type: Transform
+      pos: 5.5,14.5
+      parent: 1
+  - uid: 895
+    components:
+    - type: Transform
+      pos: 6.5,14.5
+      parent: 1
+  - uid: 896
+    components:
+    - type: Transform
+      pos: 7.5,14.5
+      parent: 1
+  - uid: 897
+    components:
+    - type: Transform
+      pos: 8.5,14.5
+      parent: 1
+  - uid: 898
+    components:
+    - type: Transform
+      pos: 9.5,14.5
+      parent: 1
+  - uid: 899
+    components:
+    - type: Transform
+      pos: 10.5,14.5
+      parent: 1
+  - uid: 900
+    components:
+    - type: Transform
+      pos: 11.5,15.5
+      parent: 1
+  - uid: 901
+    components:
+    - type: Transform
+      pos: 10.5,15.5
+      parent: 1
+  - uid: 902
+    components:
+    - type: Transform
+      pos: 9.5,15.5
+      parent: 1
+  - uid: 903
+    components:
+    - type: Transform
+      pos: 8.5,15.5
+      parent: 1
+  - uid: 904
+    components:
+    - type: Transform
+      pos: 7.5,15.5
+      parent: 1
+  - uid: 905
+    components:
+    - type: Transform
+      pos: 6.5,15.5
+      parent: 1
+  - uid: 906
+    components:
+    - type: Transform
+      pos: 5.5,15.5
+      parent: 1
+  - uid: 907
+    components:
+    - type: Transform
+      pos: 4.5,15.5
+      parent: 1
+  - uid: 908
+    components:
+    - type: Transform
+      pos: 3.5,15.5
+      parent: 1
+  - uid: 909
+    components:
+    - type: Transform
+      pos: 2.5,15.5
+      parent: 1
+  - uid: 910
+    components:
+    - type: Transform
+      pos: 1.5,15.5
+      parent: 1
+  - uid: 911
+    components:
+    - type: Transform
+      pos: 0.5,15.5
+      parent: 1
+  - uid: 912
+    components:
+    - type: Transform
+      pos: -0.5,15.5
+      parent: 1
+  - uid: 913
+    components:
+    - type: Transform
+      pos: -2.5,12.5
+      parent: 1
+  - uid: 914
+    components:
+    - type: Transform
+      pos: -1.5,12.5
+      parent: 1
+  - uid: 915
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 1
+  - uid: 916
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 917
+    components:
+    - type: Transform
+      pos: 1.5,12.5
+      parent: 1
+  - uid: 918
+    components:
+    - type: Transform
+      pos: 2.5,12.5
+      parent: 1
+  - uid: 919
+    components:
+    - type: Transform
+      pos: 3.5,12.5
+      parent: 1
+  - uid: 920
+    components:
+    - type: Transform
+      pos: 4.5,12.5
+      parent: 1
+  - uid: 921
+    components:
+    - type: Transform
+      pos: 5.5,12.5
+      parent: 1
+  - uid: 922
+    components:
+    - type: Transform
+      pos: 6.5,12.5
+      parent: 1
+  - uid: 923
+    components:
+    - type: Transform
+      pos: 7.5,12.5
+      parent: 1
+  - uid: 924
+    components:
+    - type: Transform
+      pos: 8.5,12.5
+      parent: 1
+  - uid: 925
+    components:
+    - type: Transform
+      pos: 9.5,12.5
+      parent: 1
+  - uid: 926
+    components:
+    - type: Transform
+      pos: 10.5,12.5
+      parent: 1
+  - uid: 927
+    components:
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 1
+  - uid: 928
+    components:
+    - type: Transform
+      pos: -1.5,13.5
+      parent: 1
+  - uid: 929
+    components:
+    - type: Transform
+      pos: -0.5,13.5
+      parent: 1
+  - uid: 930
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+  - uid: 931
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+  - uid: 932
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 1
+  - uid: 933
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+  - uid: 934
+    components:
+    - type: Transform
+      pos: 4.5,13.5
+      parent: 1
+  - uid: 935
+    components:
+    - type: Transform
+      pos: 5.5,13.5
+      parent: 1
+  - uid: 936
+    components:
+    - type: Transform
+      pos: 6.5,13.5
+      parent: 1
+  - uid: 937
+    components:
+    - type: Transform
+      pos: 7.5,13.5
+      parent: 1
+  - uid: 938
+    components:
+    - type: Transform
+      pos: 8.5,13.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 756
-    - type: DeviceLinkSource
-      linkedPorts:
-        755:
-        - DoorStatus: InputA
-- proto: AirlockGlass
-  entities:
-  - uid: 7
+  - uid: 939
     components:
     - type: Transform
-      pos: -5.5,-0.5
+      pos: 9.5,13.5
       parent: 1
-  - uid: 18
+  - uid: 940
     components:
     - type: Transform
-      pos: -7.5,-0.5
+      pos: 10.5,13.5
       parent: 1
-  - uid: 34
+  - uid: 941
     components:
     - type: Transform
-      pos: -6.5,-0.5
+      pos: 11.5,13.5
       parent: 1
-  - uid: 378
+  - uid: 942
     components:
     - type: Transform
-      pos: 5.5,-0.5
+      pos: 0.5,9.5
       parent: 1
-  - uid: 379
+  - uid: 943
     components:
     - type: Transform
-      pos: 6.5,-0.5
+      pos: 0.5,8.5
       parent: 1
-  - uid: 380
+  - uid: 944
     components:
     - type: Transform
-      pos: 7.5,-0.5
+      pos: -0.5,8.5
       parent: 1
-- proto: AirlockGlassShuttle
-  entities:
-  - uid: 606
+  - uid: 945
     components:
     - type: Transform
-      pos: -5.5,-6.5
+      pos: 0.5,7.5
       parent: 1
-  - uid: 610
+  - uid: 946
     components:
     - type: Transform
-      pos: 6.5,-6.5
+      pos: -6.5,6.5
       parent: 1
-  - uid: 612
+  - uid: 947
     components:
     - type: Transform
-      pos: 5.5,-6.5
+      pos: -6.5,5.5
       parent: 1
-  - uid: 620
+  - uid: 948
     components:
     - type: Transform
-      pos: 7.5,-6.5
+      pos: -5.5,5.5
       parent: 1
-  - uid: 621
+  - uid: 949
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-5.5
+      pos: -5.5,6.5
       parent: 1
-  - uid: 622
+  - uid: 950
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-4.5
+      pos: -4.5,6.5
       parent: 1
-  - uid: 623
+  - uid: 951
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-3.5
+      pos: -4.5,5.5
       parent: 1
-  - uid: 794
+  - uid: 952
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-3.5
+      pos: -3.5,5.5
       parent: 1
-  - uid: 795
+  - uid: 953
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-4.5
+      pos: -3.5,6.5
       parent: 1
-  - uid: 796
+  - uid: 954
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-5.5
+      pos: -2.5,6.5
       parent: 1
-  - uid: 797
+  - uid: 955
     components:
     - type: Transform
-      pos: -7.5,-6.5
+      pos: -2.5,5.5
       parent: 1
-  - uid: 798
+  - uid: 956
     components:
     - type: Transform
-      pos: -6.5,-6.5
+      pos: -1.5,5.5
       parent: 1
-- proto: APCBasic
-  entities:
-  - uid: 414
+  - uid: 957
     components:
     - type: Transform
-      pos: -2.5,7.5
+      pos: -1.5,6.5
       parent: 1
-  - uid: 415
+  - uid: 958
     components:
     - type: Transform
-      pos: -2.5,4.5
+      pos: -0.5,6.5
       parent: 1
-- proto: AtmosDeviceFanTiny
-  entities:
-  - uid: 8
+  - uid: 959
     components:
     - type: Transform
-      pos: -5.5,-6.5
+      pos: -0.5,5.5
       parent: 1
-  - uid: 734
+  - uid: 960
     components:
     - type: Transform
-      pos: 8.5,-3.5
+      pos: 0.5,5.5
       parent: 1
-  - uid: 739
+  - uid: 961
     components:
     - type: Transform
-      pos: 8.5,-4.5
+      pos: 0.5,6.5
       parent: 1
-  - uid: 743
+  - uid: 962
     components:
     - type: Transform
-      pos: 8.5,-5.5
+      pos: 1.5,6.5
       parent: 1
-  - uid: 744
+  - uid: 963
     components:
     - type: Transform
-      pos: 7.5,-6.5
+      pos: 1.5,5.5
       parent: 1
-  - uid: 745
+  - uid: 964
     components:
     - type: Transform
-      pos: 6.5,-6.5
+      pos: 2.5,5.5
       parent: 1
-  - uid: 746
+  - uid: 965
     components:
     - type: Transform
-      pos: 5.5,-6.5
+      pos: 2.5,6.5
       parent: 1
-  - uid: 803
+  - uid: 966
     components:
     - type: Transform
-      pos: -6.5,-6.5
+      pos: 3.5,6.5
       parent: 1
-  - uid: 804
+  - uid: 967
     components:
     - type: Transform
-      pos: -7.5,-6.5
+      pos: 3.5,5.5
       parent: 1
-  - uid: 805
+  - uid: 968
     components:
     - type: Transform
-      pos: -8.5,-5.5
+      pos: 10.5,0.5
       parent: 1
-  - uid: 806
+  - uid: 969
     components:
     - type: Transform
-      pos: -8.5,-4.5
+      pos: -10.5,0.5
       parent: 1
-  - uid: 807
+  - uid: 970
     components:
     - type: Transform
-      pos: -8.5,-3.5
+      pos: -10.5,7.5
+      parent: 1
+  - uid: 971
+    components:
+    - type: Transform
+      pos: 10.5,7.5
       parent: 1
 - proto: BarSignEngineChange
   entities:
@@ -2743,80 +3537,16 @@ entities:
       parent: 1
 - proto: FoodBoxDonut
   entities:
-  - uid: 812
+  - uid: 818
     components:
     - type: Transform
-      pos: -7.6037674,3.8322606
-      parent: 1
-    - type: Storage
-      storedItems:
-        818:
-          position: 0,0
-          _rotation: South
-        819:
-          position: 1,0
-          _rotation: South
-        820:
-          position: 2,0
-          _rotation: South
-        821:
-          position: 3,0
-          _rotation: South
-        822:
-          position: 4,0
-          _rotation: South
-        823:
-          position: 5,0
-          _rotation: South
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 818
-          - 819
-          - 820
-          - 821
-          - 822
-          - 823
-  - uid: 824
+      pos: -7.3893456,3.6276252
+      parent: 1
+  - uid: 820
     components:
     - type: Transform
-      pos: -7.385018,3.4416356
-      parent: 1
-    - type: Storage
-      storedItems:
-        825:
-          position: 0,0
-          _rotation: South
-        826:
-          position: 1,0
-          _rotation: South
-        827:
-          position: 2,0
-          _rotation: South
-        828:
-          position: 3,0
-          _rotation: South
-        829:
-          position: 4,0
-          _rotation: South
-        830:
-          position: 5,0
-          _rotation: South
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 825
-          - 826
-          - 827
-          - 828
-          - 829
-          - 830
+      pos: -7.556012,3.7422085
+      parent: 1
 - proto: FoodBoxPizzaFilled
   entities:
   - uid: 550
@@ -2840,80 +3570,6 @@ entities:
     - type: Transform
       pos: -0.22007972,5.7634063
       parent: 1
-- proto: FoodDonutPink
-  entities:
-  - uid: 818
-    components:
-    - type: Transform
-      parent: 812
-    - type: Physics
-      canCollide: False
-  - uid: 819
-    components:
-    - type: Transform
-      parent: 812
-    - type: Physics
-      canCollide: False
-  - uid: 820
-    components:
-    - type: Transform
-      parent: 812
-    - type: Physics
-      canCollide: False
-  - uid: 821
-    components:
-    - type: Transform
-      parent: 812
-    - type: Physics
-      canCollide: False
-  - uid: 822
-    components:
-    - type: Transform
-      parent: 812
-    - type: Physics
-      canCollide: False
-  - uid: 823
-    components:
-    - type: Transform
-      parent: 812
-    - type: Physics
-      canCollide: False
-  - uid: 825
-    components:
-    - type: Transform
-      parent: 824
-    - type: Physics
-      canCollide: False
-  - uid: 826
-    components:
-    - type: Transform
-      parent: 824
-    - type: Physics
-      canCollide: False
-  - uid: 827
-    components:
-    - type: Transform
-      parent: 824
-    - type: Physics
-      canCollide: False
-  - uid: 828
-    components:
-    - type: Transform
-      parent: 824
-    - type: Physics
-      canCollide: False
-  - uid: 829
-    components:
-    - type: Transform
-      parent: 824
-    - type: Physics
-      canCollide: False
-  - uid: 830
-    components:
-    - type: Transform
-      parent: 824
-    - type: Physics
-      canCollide: False
 - proto: FoodMeatRotten
   entities:
   - uid: 518
@@ -4181,8 +4837,8 @@ entities:
         immutable: False
         temperature: 293.1497
         moles:
-        - 1.8856695
-        - 7.0937095
+        - 1.8968438
+        - 7.1357465
         - 0
         - 0
         - 0
@@ -4199,10 +4855,10 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 219
-          - 296
-          - 528
           - 388
+          - 528
+          - 296
+          - 219
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -4215,7 +4871,7 @@ entities:
       pos: -8.5,7.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -643.5483
+      secondsUntilStateChange: -980.0301
       state: Opening
 - proto: HyperlinkBookSupernanny
   entities:
@@ -4268,8 +4924,8 @@ entities:
         immutable: False
         temperature: 293.14972
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -4286,14 +4942,14 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 594
-          - 587
-          - 588
-          - 589
-          - 590
-          - 591
-          - 592
           - 593
+          - 592
+          - 591
+          - 590
+          - 589
+          - 588
+          - 587
+          - 594
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -4309,8 +4965,8 @@ entities:
         immutable: False
         temperature: 293.14972
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -4327,13 +4983,13 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 602
-          - 596
-          - 597
-          - 598
-          - 599
-          - 600
           - 601
+          - 600
+          - 599
+          - 598
+          - 597
+          - 596
+          - 602
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -4351,8 +5007,8 @@ entities:
         immutable: False
         temperature: 293.1497
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -4369,13 +5025,13 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 513
-          - 514
-          - 515
-          - 516
-          - 517
-          - 518
           - 519
+          - 518
+          - 517
+          - 516
+          - 515
+          - 514
+          - 513
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True