diff --git a/Resources/Maps/_NF/POI/medical.yml b/Resources/Maps/_NF/POI/medical.yml
index b0fd2fb559e..4224585c073 100644
--- a/Resources/Maps/_NF/POI/medical.yml
+++ b/Resources/Maps/_NF/POI/medical.yml
@@ -53,11 +53,11 @@ entities:
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAABAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAABAAAAAAABAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAABAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAABAAAAAAABAAAAAAA
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAAgAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAAgAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAAgAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbQAAAAAAZwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAZwAAAAAAAgAAAAAAZwAAAAAABAAAAAAABAAAAAAABAAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAZwAAAAAAZwAAAAAABAAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAZwAAAAAAAgAAAAAAZwAAAAAABAAAAAAABAAAAAAABAAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAAgAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAAgAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAAgAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbQAAAAAAZwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAZwAAAAAAAgAAAAAAZwAAAAAABAAAAAAABAAAAAAABAAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAZwAAAAAAZwAAAAAABAAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAZwAAAAAAAgAAAAAAZwAAAAAABAAAAAAABAAAAAAABAAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAbQAAAAAAbQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,1:
           ind: -1,1
@@ -96,18 +96,17 @@ entities:
           decals:
             1448: 1,14
             1449: 3,14
-        - node:
-            color: '#FFFFFFFF'
-            id: Bot
-          decals:
-            1613: -3,-13
-            1614: -3,-14
         - node:
             color: '#96DAFF3F'
             id: BotGreyscale
           decals:
             1263: -3,8
             1264: -3,7
+        - node:
+            color: '#FFFFFFFF'
+            id: BoxGreyscale
+          decals:
+            1628: -5,-11
         - node:
             color: '#96DAFF7F'
             id: BrickCornerOverlayNE
@@ -238,7 +237,6 @@ entities:
             color: '#37789BFF'
             id: BrickTileSteelCornerNe
           decals:
-            1083: 4,-24
             1102: 4,19
         - node:
             color: '#52B4E9FF'
@@ -260,7 +258,6 @@ entities:
             color: '#37789BFF'
             id: BrickTileSteelCornerNw
           decals:
-            1085: 0,-24
             1101: 0,19
         - node:
             color: '#52B4E9FF'
@@ -282,7 +279,6 @@ entities:
             color: '#37789BFF'
             id: BrickTileSteelCornerSe
           decals:
-            1084: 4,-25
             1100: 4,18
         - node:
             color: '#52B4E9FF'
@@ -306,7 +302,6 @@ entities:
             color: '#37789BFF'
             id: BrickTileSteelCornerSw
           decals:
-            1086: 0,-25
             1099: 0,18
         - node:
             color: '#52B4E9FF'
@@ -402,7 +397,6 @@ entities:
             1585: 5,-16
             1600: 1,-20
             1607: 1,10
-            1608: -2,-24
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNw
@@ -419,12 +413,12 @@ entities:
             1486: 3,14
             1489: 0,14
             1515: -4,13
-            1565: 6,-24
             1576: -4,-17
             1578: 8,-16
             1584: -1,-16
             1601: 3,-20
             1606: 3,10
+            1629: 1,-15
         - node:
             color: '#52B4E9FF'
             id: BrickTileSteelInnerSe
@@ -446,7 +440,6 @@ entities:
             1477: 3,9
             1511: -4,10
             1517: -2,18
-            1566: -2,-25
             1567: -2,-20
             1575: 8,-19
             1595: 4,-20
@@ -468,7 +461,6 @@ entities:
             1478: 1,9
             1514: -1,10
             1516: -4,11
-            1568: 6,-25
             1569: 6,-20
             1574: -4,-19
             1594: 0,-20
@@ -534,13 +526,12 @@ entities:
             1553: 8,-23
             1554: 8,-22
             1555: 8,-21
+            1630: -2,-24
+            1631: -2,-25
         - node:
             color: '#37789BFF'
             id: BrickTileSteelLineN
           decals:
-            1090: 3,-24
-            1091: 2,-24
-            1092: 1,-24
             1093: 3,19
             1094: 2,19
             1095: 1,19
@@ -577,9 +568,6 @@ entities:
             color: '#37789BFF'
             id: BrickTileSteelLineS
           decals:
-            1087: 1,-25
-            1088: 2,-25
-            1089: 3,-25
             1096: 1,18
             1097: 2,18
             1098: 3,18
@@ -615,6 +603,11 @@ entities:
           decals:
             1342: 6,-8
             1343: 6,-7
+        - node:
+            color: '#DE3A3AFF'
+            id: BrickTileSteelLineW
+          decals:
+            1633: 6,-25
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineW
@@ -675,6 +668,52 @@ entities:
             1571: 6,-23
             1572: 6,-22
             1573: 6,-21
+            1652: 6,-24
+        - node:
+            color: '#9C2020BF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            1683: 4,-23
+        - node:
+            color: '#FF9821BF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            1686: 1,-23
+        - node:
+            color: '#9C2020BF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            1684: 3,-23
+        - node:
+            color: '#FF9821BF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            1685: 0,-23
+        - node:
+            color: '#9C2020BF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            1677: 4,-26
+        - node:
+            color: '#FF9821BF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            1688: 1,-24
+        - node:
+            color: '#FF9821BF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            1687: 0,-24
+        - node:
+            color: '#9C2020BF'
+            id: BrickTileWhiteEndW
+          decals:
+            1671: 0,-26
+        - node:
+            color: '#9C2020BF'
+            id: BrickTileWhiteInnerNw
+          decals:
+            1678: 3,-26
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineE
@@ -686,6 +725,12 @@ entities:
           decals:
             1539: 8,10
             1544: 8,-20
+        - node:
+            color: '#9C2020BF'
+            id: BrickTileWhiteLineE
+          decals:
+            1679: 4,-25
+            1680: 4,-24
         - node:
             color: '#9C2020FF'
             id: BrickTileWhiteLineE
@@ -706,6 +751,12 @@ entities:
           decals:
             1540: 8,14
             1545: 8,-16
+        - node:
+            color: '#9C2020BF'
+            id: BrickTileWhiteLineN
+          decals:
+            1672: 1,-26
+            1673: 2,-26
         - node:
             color: '#9C2020FF'
             id: BrickTileWhiteLineN
@@ -718,6 +769,13 @@ entities:
             1188: -6,-17
             1189: 11,-17
             1190: 10,-17
+        - node:
+            color: '#9C2020BF'
+            id: BrickTileWhiteLineS
+          decals:
+            1674: 1,-26
+            1675: 2,-26
+            1676: 3,-26
         - node:
             color: '#9C2020FF'
             id: BrickTileWhiteLineS
@@ -736,6 +794,12 @@ entities:
           decals:
             1534: -4,10
             1543: -4,-16
+        - node:
+            color: '#9C2020BF'
+            id: BrickTileWhiteLineW
+          decals:
+            1681: 3,-25
+            1682: 3,-24
         - node:
             color: '#9C2020FF'
             id: BrickTileWhiteLineW
@@ -767,6 +831,8 @@ entities:
           decals:
             1615: -5,-13
             1616: -5,-14
+            1626: -3,-13
+            1627: -3,-14
         - node:
             color: '#0E7F1BFF'
             id: DeliveryGreyscale
@@ -781,7 +847,6 @@ entities:
             color: '#951710FF'
             id: DeliveryGreyscale
           decals:
-            1623: -5,-11
             1624: -3,-11
         - node:
             color: '#E6E6E63F'
@@ -805,9 +870,6 @@ entities:
             1238: 7,-12
             1239: 7,-14
             1290: -4,-23
-            1291: 1,-25
-            1292: 3,-24
-            1293: 4,-25
             1294: 6,-26
             1295: 8,-26
             1296: 9,-25
@@ -1185,9 +1247,6 @@ entities:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleE
           decals:
-            1009: -1,-24
-            1011: -1,-25
-            1012: 5,-24
             1013: 5,-25
             1045: -1,19
             1046: -1,18
@@ -1209,6 +1268,7 @@ entities:
             700: 3,-14
             1032: 8,9
             1355: 8,-10
+            1656: 1,-25
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleS
@@ -1224,13 +1284,11 @@ entities:
             703: 3,-14
             1035: 8,9
             1354: 8,-10
+            1655: 1,-25
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleW
           decals:
-            1005: -1,-24
-            1006: -1,-25
-            1007: 5,-24
             1008: 5,-25
             1041: -1,19
             1042: -1,18
@@ -1546,19 +1604,19 @@ entities:
           -1,-8:
             0: 28672
           -1,-7:
-            0: 63351
+            0: 30583
           -1,-6:
-            0: 30591
+            0: 30583
           0,-8:
             1: 4096
           0,-7:
-            0: 65280
+            0: 44800
           0,-6:
-            0: 45311
+            0: 45243
           1,-7:
             0: 64972
           1,-6:
-            0: 56543
+            0: 56541
           1,-8:
             1: 4096
             0: 49152
@@ -1811,7 +1869,7 @@ entities:
       - 1091
       - 914
       - 1092
-      - 915
+      - 634
       - 825
       - 710
       - 921
@@ -1868,20 +1926,6 @@ entities:
     - type: Transform
       pos: 8.5,-14.5
       parent: 1
-- proto: AirlockChiefMedicalOfficerLocked
-  entities:
-  - uid: 686
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-9.5
-      parent: 1
-  - uid: 693
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-8.5
-      parent: 1
 - proto: AirlockEngineering
   entities:
   - uid: 231
@@ -2035,6 +2079,20 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-26.5
       parent: 1
+- proto: AirlockFrontierCommandLocked
+  entities:
+  - uid: 7
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-8.5
+      parent: 1
+  - uid: 418
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-9.5
+      parent: 1
 - proto: AirlockGlassShuttle
   entities:
   - uid: 604
@@ -2177,30 +2235,6 @@ entities:
       parent: 1
 - proto: AirlockMedical
   entities:
-  - uid: 633
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-24.5
-      parent: 1
-  - uid: 634
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-23.5
-      parent: 1
-  - uid: 635
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-24.5
-      parent: 1
-  - uid: 636
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-23.5
-      parent: 1
   - uid: 637
     components:
     - type: Transform
@@ -2269,6 +2303,21 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,8.5
       parent: 1
+- proto: AirlockSecurityGlassLocked
+  entities:
+  - uid: 1501
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-24.5
+      parent: 1
+- proto: AirlockSecurityLocked
+  entities:
+  - uid: 345
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
 - proto: AirSensor
   entities:
   - uid: 129
@@ -2780,6 +2829,13 @@ entities:
     - type: Transform
       pos: 9.722155,7.4152374
       parent: 1
+- proto: BoxZiptie
+  entities:
+  - uid: 833
+    components:
+    - type: Transform
+      pos: 4.774123,-22.053812
+      parent: 1
 - proto: Bucket
   entities:
   - uid: 298
@@ -2787,6 +2843,14 @@ entities:
     - type: Transform
       pos: 9.40447,6.811061
       parent: 1
+- proto: ButtonFrameCautionSecurity
+  entities:
+  - uid: 441
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-26.5
+      parent: 1
 - proto: ButtonFrameGrey
   entities:
   - uid: 6
@@ -2883,6 +2947,11 @@ entities:
     - type: Transform
       pos: 4.5,-8.5
       parent: 1
+  - uid: 565
+    components:
+    - type: Transform
+      pos: 6.5,-23.5
+      parent: 1
   - uid: 702
     components:
     - type: Transform
@@ -4287,13 +4356,6 @@ entities:
     - type: Transform
       pos: 3.5,-2.5
       parent: 1
-- proto: CableTerminal
-  entities:
-  - uid: 294
-    components:
-    - type: Transform
-      pos: -2.5,-12.5
-      parent: 1
 - proto: Carpet
   entities:
   - uid: 259
@@ -4424,6 +4486,7 @@ entities:
   - uid: 299
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -3.5,-10.5
       parent: 1
   - uid: 306
@@ -4460,6 +4523,14 @@ entities:
     - type: Transform
       pos: 0.5,7.5
       parent: 1
+- proto: ChairOfficeDark
+  entities:
+  - uid: 491
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5157216,-23.336805
+      parent: 1
 - proto: ChairWoodFancyBlack
   entities:
   - uid: 308
@@ -4586,11 +4657,6 @@ entities:
       parent: 1
 - proto: computerBodyScanner
   entities:
-  - uid: 575
-    components:
-    - type: Transform
-      pos: 0.5,-22.5
-      parent: 1
   - uid: 590
     components:
     - type: Transform
@@ -4628,6 +4694,13 @@ entities:
     - type: Transform
       pos: 10.5,-5.5
       parent: 1
+- proto: ComputerTabletopCriminalRecords
+  entities:
+  - uid: 575
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
 - proto: ComputerTabletopShuttle
   entities:
   - uid: 369
@@ -4756,10 +4829,12 @@ entities:
     - type: Transform
       pos: 2.5,18.5
       parent: 1
-  - uid: 852
+- proto: DefaultStationBeaconSecurity
+  entities:
+  - uid: 1665
     components:
     - type: Transform
-      pos: 2.5,-24.5
+      pos: 2.5,-25.5
       parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
@@ -4806,18 +4881,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,-5.5
       parent: 1
-  - uid: 1500
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-23.5
-      parent: 1
-  - uid: 1501
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-23.5
-      parent: 1
   - uid: 1529
     components:
     - type: Transform
@@ -4942,30 +5005,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,8.5
       parent: 1
-  - uid: 1503
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-23.5
-      parent: 1
-  - uid: 1504
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-23.5
-      parent: 1
   - uid: 1505
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,-23.5
       parent: 1
-  - uid: 1507
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-23.5
-      parent: 1
   - uid: 1514
     components:
     - type: Transform
@@ -5311,11 +5356,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,17.5
       parent: 1
-  - uid: 1593
-    components:
-    - type: Transform
-      pos: 2.5,-22.5
-      parent: 1
   - uid: 1670
     components:
     - type: Transform
@@ -5329,11 +5369,6 @@ entities:
     - type: Transform
       pos: 4.5,-6.5
       parent: 1
-  - uid: 587
-    components:
-    - type: Transform
-      pos: 2.5,-22.5
-      parent: 1
   - uid: 798
     components:
     - type: Transform
@@ -5366,25 +5401,21 @@ entities:
     - type: Transform
       pos: 7.542074,-6.1568594
       parent: 1
-- proto: EmergencyLight
+- proto: DrinkMug
   entities:
-  - uid: 715
+  - uid: 586
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-19.5
+      pos: 4.1198883,-22.51389
       parent: 1
+- proto: EmergencyLight
+  entities:
   - uid: 759
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,7.5
       parent: 1
-  - uid: 903
-    components:
-    - type: Transform
-      pos: 2.5,-22.5
-      parent: 1
   - uid: 913
     components:
     - type: Transform
@@ -5440,11 +5471,6 @@ entities:
     - type: Transform
       pos: -2.5,-15.5
       parent: 1
-  - uid: 1640
-    components:
-    - type: Transform
-      pos: 2.5,14.5
-      parent: 1
   - uid: 1642
     components:
     - type: Transform
@@ -5834,21 +5860,6 @@ entities:
     - type: Transform
       pos: 5.5,-24.5
       parent: 1
-  - uid: 832
-    components:
-    - type: Transform
-      pos: 5.5,-23.5
-      parent: 1
-  - uid: 833
-    components:
-    - type: Transform
-      pos: -0.5,-23.5
-      parent: 1
-  - uid: 834
-    components:
-    - type: Transform
-      pos: -0.5,-24.5
-      parent: 1
   - uid: 836
     components:
     - type: Transform
@@ -5944,6 +5955,14 @@ entities:
       color: '#990000FF'
 - proto: GasPipeBend
   entities:
+  - uid: 293
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 361
     components:
     - type: Transform
@@ -6022,6 +6041,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 1507
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPipeFourway
   entities:
   - uid: 839
@@ -6225,6 +6252,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 589
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 657
     components:
     - type: Transform
@@ -8234,13 +8269,6 @@ entities:
       color: '#990000FF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 288
-    components:
-    - type: Transform
-      pos: -3.5,-10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 687
     components:
     - type: Transform
@@ -8440,15 +8468,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-11.5
       parent: 1
-  - uid: 292
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 300
+  - uid: 300
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -8468,6 +8488,16 @@ entities:
       color: '#990000FF'
 - proto: GasVentPump
   entities:
+  - uid: 634
+    components:
+    - type: Transform
+      pos: 1.5,-23.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 850
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 664
     components:
     - type: Transform
@@ -8553,17 +8583,6 @@ entities:
       - 850
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 915
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-24.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 850
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 916
     components:
     - type: Transform
@@ -9118,6 +9137,16 @@ entities:
       color: '#990000FF'
 - proto: GeneratorBasic15kW
   entities:
+  - uid: 288
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -2.5,-13.5
+      parent: 1
   - uid: 486
     components:
     - type: Transform
@@ -9130,10 +9159,10 @@ entities:
       parent: 1
 - proto: GravityGeneratorMini
   entities:
-  - uid: 901
+  - uid: 294
     components:
     - type: Transform
-      pos: -2.5,-12.5
+      pos: -4.5,-10.5
       parent: 1
 - proto: Grille
   entities:
@@ -9328,6 +9357,28 @@ entities:
     - type: Transform
       pos: -5.5,-24.5
       parent: 1
+  - uid: 633
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-24.5
+      parent: 1
+  - uid: 635
+    components:
+    - type: Transform
+      pos: 2.5,-23.5
+      parent: 1
+  - uid: 718
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 1
+  - uid: 832
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-24.5
+      parent: 1
   - uid: 978
     components:
     - type: Transform
@@ -9455,6 +9506,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,-26.5
       parent: 1
+- proto: GunSafeTurretsCdet
+  entities:
+  - uid: 513
+    components:
+    - type: Transform
+      pos: 4.5,-23.5
+      parent: 1
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 33
@@ -9526,6 +9584,13 @@ entities:
     - type: Transform
       pos: 7.5,-11.5
       parent: 1
+- proto: LockerEvidence
+  entities:
+  - uid: 915
+    components:
+    - type: Transform
+      pos: 0.5,-25.5
+      parent: 1
 - proto: LockerJanitorFilled
   entities:
   - uid: 695
@@ -9533,6 +9598,13 @@ entities:
     - type: Transform
       pos: 7.5,6.5
       parent: 1
+- proto: LockerSecurityFilled
+  entities:
+  - uid: 636
+    components:
+    - type: Transform
+      pos: 4.4581175,-25.534967
+      parent: 1
 - proto: MachineCryoSleepPod
   entities:
   - uid: 14
@@ -9603,6 +9675,13 @@ entities:
     - type: Transform
       pos: -2.5,8.5
       parent: 1
+- proto: MedkitAdvancedFilled
+  entities:
+  - uid: 1504
+    components:
+    - type: Transform
+      pos: 4.229605,-22.090555
+      parent: 1
 - proto: MedkitFilled
   entities:
   - uid: 545
@@ -9646,172 +9725,6 @@ entities:
       parent: 1
 - proto: Morgue
   entities:
-  - uid: 345
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-25.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 424
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-25.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 441
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-25.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 450
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-25.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 565
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-25.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 588
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 589
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
   - uid: 789
     components:
     - type: Transform
@@ -9849,6 +9762,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,17.5
       parent: 1
+- proto: NFHolopadMedicalDispatchDoC
+  entities:
+  - uid: 715
+    components:
+    - type: Transform
+      pos: 10.5,-6.5
+      parent: 1
 - proto: NFPosterContrabandEmsCoords
   entities:
   - uid: 1666
@@ -10033,14 +9953,6 @@ entities:
       parent: 1
 - proto: NitrogenCanister
   entities:
-  - uid: 293
-    components:
-    - type: Transform
-      anchored: True
-      pos: -4.5,-10.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 301
     components:
     - type: Transform
@@ -10059,11 +9971,6 @@ entities:
       parent: 1
 - proto: OperatingTable
   entities:
-  - uid: 586
-    components:
-    - type: Transform
-      pos: 1.5,-22.5
-      parent: 1
   - uid: 711
     components:
     - type: Transform
@@ -10087,6 +9994,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.698324,-6.049472
       parent: 1
+- proto: PortableScrubber
+  entities:
+  - uid: 1766
+    components:
+    - type: Transform
+      pos: 7.5,7.5
+      parent: 1
 - proto: PosterLegitSafetyMothPiping
   entities:
   - uid: 1664
@@ -10236,6 +10150,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,-8.5
       parent: 1
+  - uid: 1503
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-23.5
+      parent: 1
 - proto: PoweredlightBlack
   entities:
   - uid: 1607
@@ -10248,12 +10168,6 @@ entities:
       on: False
 - proto: PoweredlightBlue
   entities:
-  - uid: 719
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-25.5
-      parent: 1
   - uid: 902
     components:
     - type: Transform
@@ -10307,6 +10221,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -7.5,-14.5
       parent: 1
+- proto: PoweredlightLED
+  entities:
+  - uid: 686
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-25.5
+      parent: 1
 - proto: PoweredlightOrange
   entities:
   - uid: 797
@@ -10679,6 +10601,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,2.5
       parent: 1
+  - uid: 424
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-23.5
+      parent: 1
   - uid: 431
     components:
     - type: Transform
@@ -10729,6 +10657,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-7.5
       parent: 1
+  - uid: 901
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 1
   - uid: 906
     components:
     - type: Transform
@@ -10767,6 +10700,18 @@ entities:
     - type: Transform
       pos: 12.5,0.5
       parent: 1
+  - uid: 1640
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-24.5
+      parent: 1
+  - uid: 1652
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-24.5
+      parent: 1
 - proto: ReinforcedWindowDiagonal
   entities:
   - uid: 52
@@ -11295,6 +11240,16 @@ entities:
         - Pressed: Toggle
         1440:
         - Pressed: Toggle
+  - uid: 587
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-26.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1501:
+        - Pressed: DoorBolt
   - uid: 592
     components:
     - type: Transform
@@ -11472,23 +11427,19 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,17.5
       parent: 1
-  - uid: 488
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-22.5
-      parent: 1
-  - uid: 491
+  - uid: 552
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.5,-22.5
+      pos: -0.5,17.5
       parent: 1
-  - uid: 552
+- proto: SignSecurity
+  entities:
+  - uid: 903
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,17.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-23.5
       parent: 1
 - proto: SignSpace
   entities:
@@ -11562,13 +11513,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,6.5
       parent: 1
-- proto: SMESBasic
-  entities:
-  - uid: 718
-    components:
-    - type: Transform
-      pos: -2.5,-13.5
-      parent: 1
 - proto: SmokingPipe
   entities:
   - uid: 1535
@@ -11831,6 +11775,20 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-0.5
       parent: 1
+- proto: SteelBench
+  entities:
+  - uid: 852
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-23.5
+      parent: 1
+  - uid: 1662
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-22.5
+      parent: 1
 - proto: StoolBar
   entities:
   - uid: 78
@@ -11875,6 +11833,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,-2.5
       parent: 1
+- proto: Stunbaton
+  entities:
+  - uid: 1593
+    components:
+    - type: Transform
+      pos: 4.343466,-22.402592
+      parent: 1
 - proto: SubstationWallBasic
   entities:
   - uid: 304
@@ -11929,12 +11894,22 @@ entities:
       parent: 1
 - proto: TableCounterMetal
   entities:
+  - uid: 588
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
   - uid: 689
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,7.5
       parent: 1
+  - uid: 719
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 1
   - uid: 727
     components:
     - type: Transform
@@ -12185,11 +12160,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-6.5
       parent: 1
-  - uid: 7
-    components:
-    - type: Transform
-      pos: 2.5,-26.5
-      parent: 1
   - uid: 18
     components:
     - type: Transform
@@ -13105,11 +13075,6 @@ entities:
     - type: Transform
       pos: 9.5,-21.5
       parent: 1
-  - uid: 418
-    components:
-    - type: Transform
-      pos: 5.5,-25.5
-      parent: 1
   - uid: 419
     components:
     - type: Transform
@@ -13159,6 +13124,11 @@ entities:
     - type: Transform
       pos: 2.5,-20.5
       parent: 1
+  - uid: 450
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
   - uid: 451
     components:
     - type: Transform
@@ -13243,11 +13213,6 @@ entities:
     - type: Transform
       pos: -0.5,-22.5
       parent: 1
-  - uid: 513
-    components:
-    - type: Transform
-      pos: -0.5,-25.5
-      parent: 1
   - uid: 514
     components:
     - type: Transform
@@ -13342,6 +13307,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,0.5
       parent: 1
+  - uid: 693
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-24.5
+      parent: 1
   - uid: 694
     components:
     - type: Transform
@@ -13383,6 +13354,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,4.5
       parent: 1
+  - uid: 834
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 1
   - uid: 882
     components:
     - type: Transform
@@ -13427,12 +13403,28 @@ entities:
     - type: Transform
       pos: 7.5,-4.5
       parent: 1
+  - uid: 1331
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-25.5
+      parent: 1
+  - uid: 1336
+    components:
+    - type: Transform
+      pos: 2.5,-26.5
+      parent: 1
   - uid: 1443
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-12.5
       parent: 1
+  - uid: 1500
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 1
 - proto: WarningWaste
   entities:
   - uid: 737
@@ -13449,6 +13441,12 @@ entities:
       parent: 1
 - proto: WeaponCapacitorRecharger
   entities:
+  - uid: 488
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-22.5
+      parent: 1
   - uid: 543
     components:
     - type: Transform
@@ -13459,18 +13457,6 @@ entities:
     - type: Transform
       pos: 11.5,-6.5
       parent: 1
-- proto: WindoorSecure
-  entities:
-  - uid: 1652
-    components:
-    - type: Transform
-      pos: 8.5,6.5
-      parent: 1
-  - uid: 1665
-    components:
-    - type: Transform
-      pos: 9.5,6.5
-      parent: 1
 - proto: WindowReinforcedDirectional
   entities:
   - uid: 26
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Medical/doc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Medical/doc.yml
index 8ffac414b8d..4b572634ffd 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Medical/doc.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Medical/doc.yml
@@ -30,7 +30,7 @@
 - type: startingGear
   id: DocGear
   equipment:
-    pocket1: WeaponDisabler
+    pocket1: HypoMini
     pocket2: MedicalAppraisalTool
   storage:
     back: