diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
index b1a4ebc8ec6..22d63f607eb 100644
--- a/Resources/Maps/_NF/POI/nfsd.yml
+++ b/Resources/Maps/_NF/POI/nfsd.yml
@@ -1036,6 +1036,8 @@ entities:
             159: 1,-20
             160: 1,-21
             161: 1,-22
+            888: 1,-15
+            889: 1,-14
         - node:
             color: '#DE3A3A96'
             id: StandClear
@@ -1136,6 +1138,18 @@ entities:
             356: -1,21
             357: -1,22
             358: -1,25
+            864: 19,-6
+            865: 19,-7
+            866: 19,-8
+            867: 7,-6
+            868: 7,-7
+            869: 7,-8
+            882: -19,-6
+            883: -19,-7
+            884: -19,-8
+            885: -7,-6
+            886: -7,-7
+            887: -7,-8
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleS
@@ -1153,6 +1167,12 @@ entities:
             63: -3,1
             64: 3,1
             65: 4,1
+            852: -1,-13
+            853: 0,-13
+            854: 1,-13
+            855: -1,-23
+            856: 0,-23
+            857: 1,-23
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -1167,6 +1187,18 @@ entities:
             52: 8,11
             53: 8,12
             54: 8,13
+            870: 19,-6
+            871: 19,-7
+            872: 19,-8
+            873: 7,-6
+            874: 7,-7
+            875: 7,-8
+            876: -7,-6
+            877: -7,-7
+            878: -7,-8
+            879: -19,-6
+            880: -19,-7
+            881: -19,-8
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -1179,6 +1211,12 @@ entities:
             59: -3,-3
             60: 3,-3
             61: 4,-3
+            858: -1,-23
+            859: 0,-23
+            860: 1,-23
+            861: 1,-13
+            862: 0,-13
+            863: -1,-13
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
@@ -1376,7 +1414,7 @@ entities:
             0: 61440
           3,-1:
             0: 61440
-            2: 8
+            2: 3080
           -5,0:
             2: 292
             0: 65224
@@ -1441,7 +1479,7 @@ entities:
             2: 61986
           4,0:
             0: 65395
-            2: 132
+            2: 140
           4,1:
             0: 65535
           4,2:
@@ -1462,7 +1500,7 @@ entities:
             2: 11938
           4,-1:
             0: 4096
-            2: 8951
+            2: 26615
           0,6:
             0: 4095
             2: 61440
@@ -2329,7 +2367,7 @@ entities:
     - pos: 21.5,-10.5
       parent: 1
       type: Transform
-    - secondsUntilStateChange: -8038.3203
+    - secondsUntilStateChange: -8438.763
       state: Opening
       type: Door
   - uid: 1449
@@ -2524,7 +2562,7 @@ entities:
     - pos: 14.5,14.5
       parent: 1
       type: Transform
-    - secondsUntilStateChange: -7531.126
+    - secondsUntilStateChange: -7931.568
       state: Opening
       type: Door
   - uid: 711
@@ -11330,7 +11368,7 @@ entities:
       type: Transform
   - uid: 1617
     components:
-    - rot: 3.141592653589793 rad
+    - rot: 1.5707963267948966 rad
       pos: 2.5,-5.5
       parent: 1
       type: Transform
@@ -11348,7 +11386,8 @@ entities:
       type: Transform
   - uid: 1856
     components:
-    - pos: 2.5,-6.5
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,-6.5
       parent: 1
       type: Transform
   - uid: 2303