diff --git a/Resources/Maps/chibi.yml b/Resources/Maps/chibi.yml
index efe33bf7fd7..c1d18654e46 100644
--- a/Resources/Maps/chibi.yml
+++ b/Resources/Maps/chibi.yml
@@ -81,7 +81,7 @@ entities:
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: gQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACgQAAAAAABgAAAAACBgAAAAABEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABAQAAAAADYAAAAAACgQAAAAAABgAAAAAACwAAAAADEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAADBgAAAAACBgAAAAADCwAAAAACEQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACCQAAAAAAYAAAAAABAQAAAAACYAAAAAACCQAAAAAABgAAAAABBgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAACBgAAAAAABgAAAAAABgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAACYAAAAAABYAAAAAAAYAAAAAAACQAAAAAABgAAAAADCwAAAAABEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAADAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAQAAAAAAYAAAAAADgQAAAAAABgAAAAABCwAAAAABEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAABgAAAAADBgAAAAABgQAAAAAAgQAAAAAABgAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAABBgAAAAABBgAAAAACBgAAAAAAEQAAAAAAEQAAAAAABgAAAAADYAAAAAABBgAAAAACBgAAAAABgQAAAAAABgAAAAABBgAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAABgAAAAAABgAAAAACBgAAAAADBgAAAAADBgAAAAABAQAAAAAABgAAAAACBgAAAAAABgAAAAABBgAAAAACBgAAAAABgQAAAAAAYAAAAAADAQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAABgAAAAADBgAAAAAACQAAAAAAgQAAAAAAYAAAAAABgQAAAAAACQAAAAAABgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAABgAAAAABBgAAAAAABgAAAAAABgAAAAADBgAAAAADAQAAAAADgQAAAAAAAgAAAAACAgAAAAADAgAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADgQAAAAAABgAAAAABBgAAAAABBgAAAAACBgAAAAABBgAAAAACBgAAAAABYAAAAAABAQAAAAADAQAAAAABAgAAAAACAgAAAAACAgAAAAADYAAAAAABAQAAAAADYAAAAAADBgAAAAAAAQAAAAACAQAAAAADBgAAAAACBgAAAAABBgAAAAADgQAAAAAAgQAAAAAAAgAAAAADAgAAAAAAAgAAAAABAgAAAAAACQAAAAAAYAAAAAAAAQAAAAABYAAAAAACBgAAAAAABgAAAAAABgAAAAADBgAAAAABBgAAAAADBgAAAAABgQAAAAAABQAAAAAAgQAAAAAAAwAAAAABAwAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAACQAAAAAABgAAAAABBgAAAAADBgAAAAABBgAAAAAABgAAAAACCQAAAAAABQAAAAAAAwAAAAAAAwAAAAACAwAAAAADAwAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAADBgAAAAADAQAAAAADAQAAAAAABgAAAAACBgAAAAAABgAAAAABCQAAAAAABQAAAAAA
+          tiles: gQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACgQAAAAAABgAAAAACBgAAAAABEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABAQAAAAADYAAAAAACgQAAAAAABgAAAAAACwAAAAADEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAADBgAAAAACBgAAAAADCwAAAAACEQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACCQAAAAAAYAAAAAABAQAAAAACYAAAAAACCQAAAAAABgAAAAABBgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAACBgAAAAAABgAAAAAABgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAACYAAAAAABYAAAAAAAYAAAAAAACQAAAAAABgAAAAADCwAAAAABEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAADAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAQAAAAAAYAAAAAADgQAAAAAABgAAAAABCwAAAAABEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAAwAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAABBgAAAAABBgAAAAACBgAAAAAAEQAAAAAAEQAAAAAABgAAAAADYAAAAAABAwAAAAAAAwAAAAAABgAAAAAABgAAAAABBgAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAABgAAAAAABgAAAAACBgAAAAADBgAAAAADBgAAAAABAQAAAAAABgAAAAACBgAAAAAABgAAAAABBgAAAAACBgAAAAABgQAAAAAAYAAAAAADAQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAABgAAAAADBgAAAAAACQAAAAAAgQAAAAAAYAAAAAABgQAAAAAACQAAAAAABgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAABgAAAAABBgAAAAAABgAAAAAABgAAAAADBgAAAAADAQAAAAADgQAAAAAAAgAAAAACAgAAAAADAgAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADgQAAAAAABgAAAAABBgAAAAABBgAAAAACBgAAAAABBgAAAAACBgAAAAABYAAAAAABAQAAAAADAQAAAAABAgAAAAACAgAAAAACAgAAAAADYAAAAAABAQAAAAADYAAAAAADBgAAAAAAAQAAAAACAQAAAAADBgAAAAACBgAAAAABBgAAAAADgQAAAAAAgQAAAAAAAgAAAAADAgAAAAAAAgAAAAABAgAAAAAACQAAAAAAYAAAAAAAAQAAAAABYAAAAAACBgAAAAAABgAAAAAABgAAAAADBgAAAAABBgAAAAADBgAAAAABgQAAAAAABQAAAAAAgQAAAAAAAwAAAAABAwAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAACQAAAAAABgAAAAABBgAAAAADBgAAAAABBgAAAAAABgAAAAACCQAAAAAABQAAAAAAAwAAAAAAAwAAAAACAwAAAAADAwAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAADBgAAAAADAQAAAAADAQAAAAAABgAAAAACBgAAAAAABgAAAAABCQAAAAAABQAAAAAA
           version: 6
         0,-2:
           ind: 0,-2
@@ -203,16 +203,28 @@ entities:
           decals:
             230: 14,16
             234: 15,12
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerNe
+          decals:
+            444: 17,-8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
           decals:
             21: 15,13
+            443: 16,-8
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerSe
+          decals:
+            441: 17,-9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
           decals:
             22: 14,15
+            442: 16,-9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -829,6 +841,14 @@ entities:
           decals:
             413: 19,-24
             428: 23,-23
+        - node:
+            color: '#52B4E996'
+            id: MiniTileCheckerAOverlay
+          decals:
+            437: 17,-9
+            438: 17,-8
+            439: 16,-8
+            440: 16,-9
         - node:
             color: '#FA750096'
             id: MiniTileCheckerAOverlay
@@ -3499,10 +3519,10 @@ entities:
       parent: 2
 - proto: BodyBagFolded
   entities:
-  - uid: 1497
+  - uid: 365
     components:
     - type: Transform
-      pos: 17.345045,-6.398447
+      pos: 20.36747,-8.194437
       parent: 2
 - proto: BookAtmosDistro
   entities:
@@ -8791,11 +8811,6 @@ entities:
     - type: Transform
       pos: 3.5,-13.5
       parent: 2
-  - uid: 774
-    components:
-    - type: Transform
-      pos: 19.5,-8.5
-      parent: 2
   - uid: 775
     components:
     - type: Transform
@@ -9151,16 +9166,6 @@ entities:
     - type: Transform
       pos: -5.5,14.5
       parent: 2
-  - uid: 1490
-    components:
-    - type: Transform
-      pos: 18.5,-8.5
-      parent: 2
-  - uid: 1496
-    components:
-    - type: Transform
-      pos: 18.5,-7.5
-      parent: 2
   - uid: 1503
     components:
     - type: Transform
@@ -10057,6 +10062,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ClothingMaskBreathMedical
+  entities:
+  - uid: 1488
+    components:
+    - type: Transform
+      pos: 16.67997,-8.590546
+      parent: 2
 - proto: ClothingNeckCloakCe
   entities:
   - uid: 3773
@@ -10105,6 +10117,13 @@ entities:
     - type: Transform
       pos: 3.5972524,-12.252082
       parent: 2
+- proto: ClothingOuterVestTank
+  entities:
+  - uid: 362
+    components:
+    - type: Transform
+      pos: 16.297668,-8.287531
+      parent: 2
 - proto: ClothingShoesGaloshes
   entities:
   - uid: 4131
@@ -10575,12 +10594,12 @@ entities:
     - type: Transform
       pos: 0.5,-21.5
       parent: 2
-- proto: CrateMedicalSecure
+- proto: CrateMedicalSurgery
   entities:
-  - uid: 3879
+  - uid: 1537
     components:
     - type: Transform
-      pos: 17.5,-8.5
+      pos: 19.5,-8.5
       parent: 2
 - proto: CrateTrashCart
   entities:
@@ -10624,13 +10643,6 @@ entities:
     - type: Transform
       pos: 28.5,4.5
       parent: 2
-- proto: CryoPod
-  entities:
-  - uid: 353
-    components:
-    - type: Transform
-      pos: 16.5,-6.5
-      parent: 2
 - proto: DefaultStationBeaconArtifactLab
   entities:
   - uid: 2093
@@ -13646,10 +13658,10 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 416
+  - uid: 366
     components:
     - type: Transform
-      pos: 19.5,-6.5
+      pos: 18.5,-7.5
       parent: 2
     - type: Fixtures
       fixtures: {}
@@ -13786,11 +13798,6 @@ entities:
       parent: 2
 - proto: GasAnalyzer
   entities:
-  - uid: 367
-    components:
-    - type: Transform
-      pos: 17.686937,-6.445299
-      parent: 2
   - uid: 1536
     components:
     - type: Transform
@@ -13814,21 +13821,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FFAA00FF'
-- proto: GasFilterFlipped
-  entities:
-  - uid: 357
-    components:
-    - type: MetaData
-      desc: Very useful for filtering gases out of the cryo pipes.
-      name: cryo gas filter
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,-7.5
-      parent: 2
-    - type: GasFilter
-      transferRate: 20
-    - type: AtmosPipeColor
-      color: '#FFAA00FF'
 - proto: GasMinerNitrogen
   entities:
   - uid: 482
@@ -13935,12 +13927,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
-  - uid: 359
+  - uid: 416
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 16.5,-8.5
+      pos: 17.5,-6.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAA00FF'
   - uid: 461
     components:
     - type: Transform
@@ -14215,14 +14209,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#00AAFFFF'
-  - uid: 2152
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#00AAFFFF'
   - uid: 2204
     components:
     - type: Transform
@@ -14548,12 +14534,6 @@ entities:
       color: '#FFAA00FF'
 - proto: GasPipeStraight
   entities:
-  - uid: 360
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-8.5
-      parent: 2
   - uid: 408
     components:
     - type: Transform
@@ -14795,6 +14775,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,-25.5
       parent: 2
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 22.5,-3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#00AAFFFF'
   - uid: 981
     components:
     - type: Transform
@@ -14824,12 +14811,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#00AAFFFF'
-  - uid: 1537
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 19.5,-8.5
-      parent: 2
   - uid: 1568
     components:
     - type: Transform
@@ -15799,44 +15780,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#00AAFFFF'
-  - uid: 2150
-    components:
-    - type: Transform
-      pos: 18.5,-5.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#00AAFFFF'
-  - uid: 2151
-    components:
-    - type: Transform
-      pos: 18.5,-4.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#00AAFFFF'
-  - uid: 2153
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 19.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#00AAFFFF'
-  - uid: 2154
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#00AAFFFF'
-  - uid: 2155
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#00AAFFFF'
   - uid: 2156
     components:
     - type: Transform
@@ -17685,24 +17628,6 @@ entities:
       color: '#FFAA00FF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 290
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-7.5
-      parent: 2
-  - uid: 361
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.5,-7.5
-      parent: 2
-  - uid: 362
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,-8.5
-      parent: 2
   - uid: 460
     components:
     - type: Transform
@@ -17780,14 +17705,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FFAA00FF'
-  - uid: 1488
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-6.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FFAA00FF'
   - uid: 1567
     components:
     - type: Transform
@@ -18135,14 +18052,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#00AAFFFF'
-  - uid: 2171
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#00AAFFFF'
   - uid: 2172
     components:
     - type: Transform
@@ -18747,26 +18656,8 @@ entities:
       targetPressure: 4500
     - type: AtmosPipeColor
       color: '#0000FFFF'
-  - uid: 1493
-    components:
-    - type: MetaData
-      desc: A pump that moves gas into the cryo pipes by pressure.
-      name: cryo gas pump
-    - type: Transform
-      pos: 18.5,-6.5
-      parent: 2
-    - type: GasPressurePump
-      targetPressure: 100
-    - type: AtmosPipeColor
-      color: '#00AAFFFF'
 - proto: GasThermoMachineFreezerEnabled
   entities:
-  - uid: 32
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,-8.5
-      parent: 2
   - uid: 1161
     components:
     - type: Transform
@@ -21510,6 +21401,18 @@ entities:
       parent: 2
 - proto: HospitalCurtainsOpen
   entities:
+  - uid: 290
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-2.5
+      parent: 2
+  - uid: 360
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-5.5
+      parent: 2
   - uid: 525
     components:
     - type: Transform
@@ -21816,17 +21719,6 @@ entities:
         - Pressed: Toggle
         680:
         - Pressed: Toggle
-- proto: LockableButtonMedical
-  entities:
-  - uid: 1033
-    components:
-    - type: Transform
-      pos: 15.5,-1.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        2770:
-        - Pressed: Toggle
 - proto: LockableButtonResearch
   entities:
   - uid: 1392
@@ -21934,9 +21826,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 1512
-          - 1206
           - 1507
+          - 1206
+          - 1512
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -22056,6 +21948,13 @@ entities:
     - type: Transform
       pos: 24.5,12.5
       parent: 2
+- proto: LockerSurgeonFilled
+  entities:
+  - uid: 1497
+    components:
+    - type: Transform
+      pos: 17.5,-6.5
+      parent: 2
 - proto: LockerWallMedicalDoctorFilled
   entities:
   - uid: 383
@@ -22333,6 +22232,13 @@ entities:
     - type: Transform
       pos: 11.5,-2.5
       parent: 2
+- proto: MedicalBiofabricator
+  entities:
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 16.5,-6.5
+      parent: 2
 - proto: MedicalTechFab
   entities:
   - uid: 1120
@@ -22427,6 +22333,13 @@ entities:
     - type: Transform
       pos: -6.5,-9.5
       parent: 2
+- proto: NitrousOxideTankFilled
+  entities:
+  - uid: 357
+    components:
+    - type: Transform
+      pos: 16.39872,-8.402915
+      parent: 2
 - proto: NoticeBoard
   entities:
   - uid: 4188
@@ -22442,6 +22355,13 @@ entities:
     - type: Transform
       pos: 21.5,16.5
       parent: 2
+- proto: OperatingTable
+  entities:
+  - uid: 1490
+    components:
+    - type: Transform
+      pos: 17.5,-8.5
+      parent: 2
 - proto: Oracle
   entities:
   - uid: 4199
@@ -23197,6 +23117,17 @@ entities:
       parent: 2
 - proto: PoweredSmallLight
   entities:
+  - uid: 353
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,-7.5
+      parent: 2
+  - uid: 1498
+    components:
+    - type: Transform
+      pos: 16.5,-6.5
+      parent: 2
   - uid: 3672
     components:
     - type: Transform
@@ -23209,12 +23140,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.5,-4.5
       parent: 2
-  - uid: 3830
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-8.5
-      parent: 2
   - uid: 3837
     components:
     - type: Transform
@@ -23300,10 +23225,10 @@ entities:
     - type: Transform
       pos: 11.5,1.5
       parent: 2
-  - uid: 365
+  - uid: 359
     components:
     - type: Transform
-      pos: 17.5,-6.5
+      pos: 20.5,-8.5
       parent: 2
   - uid: 380
     components:
@@ -24309,6 +24234,13 @@ entities:
     - type: Transform
       pos: 5.5,1.5
       parent: 2
+- proto: SentientSmileCore
+  entities:
+  - uid: 4135
+    components:
+    - type: Transform
+      pos: 6.5,-9.5
+      parent: 2
 - proto: SheetGlass
   entities:
   - uid: 83
@@ -24525,6 +24457,17 @@ entities:
       linkedPorts:
         684:
         - Pressed: Trigger
+  - uid: 1033
+    components:
+    - type: Transform
+      pos: 15.5,-1.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        2770:
+        - Pressed: Open
+        2771:
+        - Pressed: Open
 - proto: SignAnomaly
   entities:
   - uid: 1582
@@ -24599,13 +24542,6 @@ entities:
     - type: Transform
       pos: 20.5,-1.5
       parent: 2
-- proto: SignCryogenicsMed
-  entities:
-  - uid: 1571
-    components:
-    - type: Transform
-      pos: 15.5,-8.5
-      parent: 2
 - proto: SignDirectionalBridge
   entities:
   - uid: 1913
@@ -24836,13 +24772,6 @@ entities:
     - type: Transform
       pos: 12.5,-1.5
       parent: 2
-- proto: SignMorgue
-  entities:
-  - uid: 2682
-    components:
-    - type: Transform
-      pos: 17.5,-5.5
-      parent: 2
 - proto: SignPrison
   entities:
   - uid: 1580
@@ -24909,6 +24838,13 @@ entities:
     - type: Transform
       pos: -0.5,-14.5
       parent: 2
+- proto: SignSurgery
+  entities:
+  - uid: 1496
+    components:
+    - type: Transform
+      pos: 17.5,-5.5
+      parent: 2
 - proto: SignToolStorage
   entities:
   - uid: 1573
@@ -25321,13 +25257,6 @@ entities:
     - type: Transform
       pos: 0.5,14.5
       parent: 2
-- proto: SpawnMobSmile
-  entities:
-  - uid: 4135
-    components:
-    - type: Transform
-      pos: 6.5,-9.5
-      parent: 2
 - proto: SpawnMobWalter
   entities:
   - uid: 4315
@@ -25612,6 +25541,13 @@ entities:
     - type: Transform
       pos: 13.5,-21.5
       parent: 2
+- proto: SpawnPointSurgeon
+  entities:
+  - uid: 361
+    components:
+    - type: Transform
+      pos: 13.5,-7.5
+      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 3928
@@ -25643,13 +25579,6 @@ entities:
     - type: Transform
       pos: -4.3361387,8.327053
       parent: 2
-- proto: StasisBed
-  entities:
-  - uid: 1498
-    components:
-    - type: Transform
-      pos: 16.5,-8.5
-      parent: 2
 - proto: StationAnchor
   entities:
   - uid: 863
@@ -26226,6 +26155,11 @@ entities:
     - type: Transform
       pos: 25.5,2.5
       parent: 2
+  - uid: 1493
+    components:
+    - type: Transform
+      pos: 16.5,-8.5
+      parent: 2
   - uid: 4335
     components:
     - type: Transform
@@ -26527,6 +26461,11 @@ entities:
           - 4273
 - proto: ToolboxEmergencyFilled
   entities:
+  - uid: 367
+    components:
+    - type: Transform
+      pos: 20.596636,-8.600969
+      parent: 2
   - uid: 3778
     components:
     - type: Transform
@@ -26552,11 +26491,6 @@ entities:
     - type: Transform
       pos: -7.7510853,8.209303
       parent: 2
-  - uid: 4187
-    components:
-    - type: Transform
-      pos: 19.646408,-7.987255
-      parent: 2
 - proto: ToolboxMechanicalFilled
   entities:
   - uid: 3782
@@ -29525,9 +29459,4 @@ entities:
     - type: Transform
       pos: 5.86946,-0.30139673
       parent: 2
-  - uid: 366
-    components:
-    - type: Transform
-      pos: 17.374437,-6.4036036
-      parent: 2
 ...
diff --git a/Resources/Prototypes/Maps/chibi.yml b/Resources/Prototypes/Maps/chibi.yml
index 6d9b4894321..ded69cc6455 100644
--- a/Resources/Prototypes/Maps/chibi.yml
+++ b/Resources/Prototypes/Maps/chibi.yml
@@ -28,6 +28,7 @@
             Chemist: [ 1, 1 ]
             MedicalDoctor: [ 1, 1 ]
             MedicalIntern: [ 1, 1 ]
+            Surgeon: [ 1, 1 ]
           #science
             ResearchAssistant: [ 1, 1 ]
             Scientist: [ 1, 1 ]