From 9034dc4cf2f02e315ac62efcd3d78de321c47e74 Mon Sep 17 00:00:00 2001
From: Syxapik <127504249+Syxapik@users.noreply.github.com>
Date: Sat, 27 Apr 2024 22:05:11 +0700
Subject: [PATCH] [FixMap] Avrite (#2070)

---
 Resources/Maps/corvax_avrit.yml | 1083 +++++++++++++++++++++++++------
 1 file changed, 882 insertions(+), 201 deletions(-)

diff --git a/Resources/Maps/corvax_avrit.yml b/Resources/Maps/corvax_avrit.yml
index 7b2ee48c369..3a1d7bd0373 100644
--- a/Resources/Maps/corvax_avrit.yml
+++ b/Resources/Maps/corvax_avrit.yml
@@ -51774,6 +51774,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -41.5,-16.5
       parent: 2
+  - uid: 5704
+    components:
+    - type: Transform
+      pos: -58.5,24.5
+      parent: 2
   - uid: 5731
     components:
     - type: Transform
@@ -51809,6 +51814,11 @@ entities:
     - type: Transform
       pos: -8.5,-34.5
       parent: 2
+  - uid: 7362
+    components:
+    - type: Transform
+      pos: -59.5,24.5
+      parent: 2
   - uid: 7619
     components:
     - type: Transform
@@ -51839,7 +51849,7 @@ entities:
   - uid: 8980
     components:
     - type: Transform
-      pos: -59.5,24.5
+      pos: -48.5,25.5
       parent: 2
   - uid: 9068
     components:
@@ -51871,11 +51881,6 @@ entities:
     - type: Transform
       pos: -71.5,15.5
       parent: 2
-  - uid: 9075
-    components:
-    - type: Transform
-      pos: -58.5,24.5
-      parent: 2
   - uid: 9264
     components:
     - type: Transform
@@ -51896,11 +51901,6 @@ entities:
     - type: Transform
       pos: -43.5,57.5
       parent: 2
-  - uid: 9819
-    components:
-    - type: Transform
-      pos: -48.5,25.5
-      parent: 2
   - uid: 10574
     components:
     - type: Transform
@@ -52681,6 +52681,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 62.5,-51.5
       parent: 2
+  - uid: 9075
+    components:
+    - type: Transform
+      pos: -52.5,24.5
+      parent: 2
   - uid: 9467
     components:
     - type: Transform
@@ -52724,6 +52729,26 @@ entities:
     - type: Transform
       pos: 7.5,32.5
       parent: 2
+  - uid: 15648
+    components:
+    - type: Transform
+      pos: 1.5,-83.5
+      parent: 2
+  - uid: 15681
+    components:
+    - type: Transform
+      pos: -3.5,-76.5
+      parent: 2
+  - uid: 15684
+    components:
+    - type: Transform
+      pos: -1.5,-79.5
+      parent: 2
+  - uid: 15687
+    components:
+    - type: Transform
+      pos: 0.5,-78.5
+      parent: 2
   - uid: 17305
     components:
     - type: Transform
@@ -52784,11 +52809,6 @@ entities:
     - type: Transform
       pos: -58.5,15.5
       parent: 2
-  - uid: 20193
-    components:
-    - type: Transform
-      pos: -52.5,24.5
-      parent: 2
   - uid: 20194
     components:
     - type: Transform
@@ -53008,21 +53028,11 @@ entities:
     - type: Transform
       pos: -36.5,-70.5
       parent: 2
-  - uid: 25054
-    components:
-    - type: Transform
-      pos: 1.5,-83.5
-      parent: 2
   - uid: 25066
     components:
     - type: Transform
       pos: 4.5,-89.5
       parent: 2
-  - uid: 25080
-    components:
-    - type: Transform
-      pos: -3.5,-76.5
-      parent: 2
   - uid: 25083
     components:
     - type: Transform
@@ -53033,16 +53043,6 @@ entities:
     - type: Transform
       pos: 33.5,-87.5
       parent: 2
-  - uid: 25093
-    components:
-    - type: Transform
-      pos: 0.5,-78.5
-      parent: 2
-  - uid: 25094
-    components:
-    - type: Transform
-      pos: -1.5,-79.5
-      parent: 2
   - uid: 26139
     components:
     - type: Transform
@@ -53288,6 +53288,16 @@ entities:
       parent: 2
 - proto: AirlockMedicalGlass
   entities:
+  - uid: 3384
+    components:
+    - type: Transform
+      pos: 5.5,-37.5
+      parent: 2
+  - uid: 5892
+    components:
+    - type: Transform
+      pos: 6.5,-37.5
+      parent: 2
   - uid: 19221
     components:
     - type: Transform
@@ -53308,6 +53318,11 @@ entities:
       parent: 66965
 - proto: AirlockMedicalGlassLocked
   entities:
+  - uid: 6818
+    components:
+    - type: Transform
+      pos: 17.5,-52.5
+      parent: 2
   - uid: 14514
     components:
     - type: Transform
@@ -53371,16 +53386,6 @@ entities:
     - type: Transform
       pos: 6.5,-42.5
       parent: 2
-  - uid: 19224
-    components:
-    - type: Transform
-      pos: 6.5,-37.5
-      parent: 2
-  - uid: 19225
-    components:
-    - type: Transform
-      pos: 5.5,-37.5
-      parent: 2
   - uid: 31011
     components:
     - type: Transform
@@ -53411,11 +53416,6 @@ entities:
     - type: Transform
       pos: 8.5,-65.5
       parent: 2
-  - uid: 14505
-    components:
-    - type: Transform
-      pos: 17.5,-52.5
-      parent: 2
   - uid: 14519
     components:
     - type: Transform
@@ -83117,7 +83117,7 @@ entities:
           _rotation: South
         28318:
           position: 2,1
-          _rotation: South
+          _rotation: East
     - type: ContainerContainer
       containers:
         storagebase: !type:Container
@@ -169606,12 +169606,6 @@ entities:
     - type: Transform
       pos: 10.5,-38.5
       parent: 2
-  - uid: 14130
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.491964,24.05956
-      parent: 2
   - uid: 15430
     components:
     - type: Transform
@@ -169733,6 +169727,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-3.5
       parent: 66965
+  - uid: 71257
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.343025,24.07659
+      parent: 2
 - proto: ChairPilotSeat
   entities:
   - uid: 7432
@@ -178210,6 +178210,13 @@ entities:
     - type: Transform
       pos: -32.612694,-6.379915
       parent: 2
+- proto: ClothingNeckCloakHos
+  entities:
+  - uid: 53282
+    components:
+    - type: Transform
+      pos: -62.44172,-11.384141
+      parent: 2
 - proto: ClothingNeckCloakMiner
   entities:
   - uid: 66192
@@ -178248,6 +178255,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ClothingNeckCloakRd
+  entities:
+  - uid: 71253
+    components:
+    - type: Transform
+      pos: 39.530334,-31.569523
+      parent: 2
 - proto: ClothingNeckClownmedal
   entities:
   - uid: 6748
@@ -186729,6 +186743,13 @@ entities:
     - type: Transform
       pos: -42.5,49.5
       parent: 2
+- proto: CrateNPCHamlet
+  entities:
+  - uid: 71345
+    components:
+    - type: Transform
+      pos: 5.5,5.5
+      parent: 2
 - proto: CrateNPCKoboldCube
   entities:
   - uid: 61191
@@ -187978,12 +187999,6 @@ entities:
     - type: Transform
       pos: 4.5,-10.5
       parent: 2
-  - uid: 14522
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,-61.5
-      parent: 2
   - uid: 18431
     components:
     - type: Transform
@@ -188278,7 +188293,7 @@ entities:
       pos: -12.5,61.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -319645.75
+      secondsUntilStateChange: -339101.94
       state: Closing
 - proto: CurtainsPurple
   entities:
@@ -209470,6 +209485,21 @@ entities:
     - type: Transform
       pos: -32.881973,31.794983
       parent: 56631
+  - uid: 71357
+    components:
+    - type: Transform
+      pos: 25.664711,-74.33285
+      parent: 2
+  - uid: 71359
+    components:
+    - type: Transform
+      pos: 25.50119,-74.57071
+      parent: 2
+  - uid: 71360
+    components:
+    - type: Transform
+      pos: 25.411997,-74.39232
+      parent: 2
 - proto: DrinkGlassCoupeShaped
   entities:
   - uid: 8055
@@ -210084,20 +210114,17 @@ entities:
   - uid: 29685
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.439936,56.84438
+      pos: -17.446234,56.778362
       parent: 2
   - uid: 29687
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.63319,56.65112
+      pos: -17.711859,56.653362
       parent: 2
   - uid: 29691
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.223812,56.84438
+      pos: -19.414984,56.747112
       parent: 2
 - proto: DrinkScrewdriverCocktailGlass
   entities:
@@ -213939,6 +213966,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 87.5,-6.5
       parent: 2
+  - uid: 20193
+    components:
+    - type: Transform
+      pos: 37.5,41.5
+      parent: 2
   - uid: 20996
     components:
     - type: Transform
@@ -214048,10 +214080,15 @@ entities:
     - type: Transform
       pos: -10.5,-83.5
       parent: 2
+  - uid: 25395
+    components:
+    - type: Transform
+      pos: 23.5,29.5
+      parent: 2
   - uid: 26434
     components:
     - type: Transform
-      pos: -41.5,25.5
+      pos: -43.5,25.5
       parent: 2
   - uid: 28900
     components:
@@ -214272,6 +214309,21 @@ entities:
     - type: Transform
       pos: -1.5,-2.5
       parent: 2
+  - uid: 71346
+    components:
+    - type: Transform
+      pos: 32.5,56.5
+      parent: 2
+  - uid: 71348
+    components:
+    - type: Transform
+      pos: 42.5,22.5
+      parent: 2
+  - uid: 71349
+    components:
+    - type: Transform
+      pos: 53.5,35.5
+      parent: 2
 - proto: ExtinguisherCabinetFilledOpen
   entities:
   - uid: 45939
@@ -237300,11 +237352,6 @@ entities:
     - type: Transform
       pos: 56.5,50.5
       parent: 2
-  - uid: 15648
-    components:
-    - type: Transform
-      pos: 56.5,51.5
-      parent: 2
   - uid: 15655
     components:
     - type: Transform
@@ -237377,11 +237424,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 47.5,52.5
       parent: 2
-  - uid: 15681
-    components:
-    - type: Transform
-      pos: 53.5,51.5
-      parent: 2
   - uid: 15682
     components:
     - type: Transform
@@ -237392,11 +237434,6 @@ entities:
     - type: Transform
       pos: 53.5,49.5
       parent: 2
-  - uid: 15684
-    components:
-    - type: Transform
-      pos: 54.5,49.5
-      parent: 2
   - uid: 15685
     components:
     - type: Transform
@@ -237407,11 +237444,6 @@ entities:
     - type: Transform
       pos: 54.5,51.5
       parent: 2
-  - uid: 15687
-    components:
-    - type: Transform
-      pos: 52.5,49.5
-      parent: 2
   - uid: 15887
     components:
     - type: Transform
@@ -296364,7 +296396,7 @@ entities:
       desc: Ручной сканер тела, способный определять жизненные показатели пациента, но сейчас он опустошён...
       name: Hemo
     - type: Transform
-      pos: 6.4176693,-82.357765
+      pos: 6.4030232,-82.36679
       parent: 2
   - uid: 62054
     components:
@@ -296559,22 +296591,22 @@ entities:
   - uid: 15689
     components:
     - type: Transform
-      pos: 53.5,51.5
+      pos: 52.5,49.5
       parent: 2
-  - uid: 15690
+  - uid: 15692
     components:
     - type: Transform
-      pos: 54.5,49.5
+      pos: 53.5,51.5
       parent: 2
-  - uid: 15692
+  - uid: 25080
     components:
     - type: Transform
       pos: 56.5,51.5
       parent: 2
-  - uid: 16264
+  - uid: 25093
     components:
     - type: Transform
-      pos: 52.5,49.5
+      pos: 54.5,49.5
       parent: 2
 - proto: HelicopterInstrument
   entities:
@@ -309692,7 +309724,7 @@ entities:
     - type: Paper
       content: >2-
 
-        Умер в игре, потеряв  выигрышь и право на жизнь. 
+        Умер в игре, потеряв  выигрыш и право на жизнь. 
 
 
         Благодарю за игру, зайчик.
@@ -310452,7 +310484,7 @@ entities:
         stampedName: stamp-component-stamped-name-centcom
       - stampedColor: '#00BE00FF'
         stampedName: stamp-component-stamped-name-approved
-      content: "──────────────────────────────────────────\n┌───────────────┐\r\n│██░███░░░░██░░░│\r                        <ФОРМА>\n│░█░████░░░██░░░│\r                    NT-CC-SEC-DCR\n│░░░██░██░░██░░░│\r                   *NT CLASSIFIED*\n│░░░██░░██░██░█░│\r\n│░░░██░░░████░██│\r\n└───────────────┘\n──────────────────────────────────────────\nУважаемый глава службы безопасности станции модели Avrite! В связи с постановлением секториального управляющего №5835.3 от 28.05.3023, на станциях данной модели был убран перма-бриг. Причиной этого послужили слишком большие расходы, на строительство станций данной модели. Отныне, роль перма-брига будут выполнять мобильные станции \"Альфа Центрава\", переработанные под тюрьму. Название станции, которая будет за вами закреплена: Каторжный лагерь \"Добрый самаритянин\". \nТакже, в скором времени кадровое бюро Nanotrasen откроет набор на новую должность, а именно \"Пилот службы безопасности\". Рекомендуется Вам найти человека на должность временного пилота, а также обучить его.\nСлава Nanotrasen!\n──────────────────────────────────────────\nПОДПИСЬ ОТПРАВИТЕЛЯ: -==,/\nМЕЧТО ДЛЯ ПЕЧАТЕЙ: "
+      content: "──────────────────────────────────────────\n┌───────────────┐\r\n│██░███░░░░██░░░│\r                        <ФОРМА>\n│░█░████░░░██░░░│\r                    NT-CC-SEC-DCR\n│░░░██░██░░██░░░│\r                   *NT CLASSIFIED*\n│░░░██░░██░██░█░│\r\n│░░░██░░░████░██│\r\n└───────────────┘\n──────────────────────────────────────────\nУважаемый глава службы безопасности станции модели Avrite! В связи с постановлением секториального управляющего №5835.3 от 28.05.3023, на станциях данной модели был убран перма-бриг. Причиной этого послужили слишком большие расходы, на строительство станций данной модели. Отныне, роль перма-брига будут выполнять мобильные станции \"Альфа Центрава\", переработанные под тюрьму. Название станции, которая будет за вами закреплена: Каторжный лагерь \"Добрый самаритянин\". \nТакже, в скором времени кадровое бюро Nanotrasen откроет набор на новую должность, а именно \"Пилот службы безопасности\". Рекомендуется Вам найти человека на должность временного пилота, а также обучить его.\nСлава Nanotrasen!\n──────────────────────────────────────────\nПОДПИСЬ ОТПРАВИТЕЛЯ: -==+,/\nМЕЧТО ДЛЯ ПЕЧАТЕЙ: "
   - uid: 52443
     components:
     - type: MetaData
@@ -313360,7 +313392,7 @@ entities:
       desc: Работа? А может лучше похлюпать в дормах?
       name: Ko4erga
     - type: Transform
-      pos: 6.4618917,-83.01247
+      pos: 6.4655232,-83.21667
       parent: 2
 - proto: PlushieAtmosian
   entities:
@@ -313419,6 +313451,8 @@ entities:
     - type: Transform
       pos: 9.869931,-84.28473
       parent: 2
+    missingComponents:
+    - RandomWalk
 - proto: PlushieHampter
   entities:
   - uid: 12687
@@ -313697,17 +313731,6 @@ entities:
     - type: Transform
       pos: -70.42232,58.705967
       parent: 2
-- proto: PlushieRouny
-  entities:
-  - uid: 52087
-    components:
-    - type: MetaData
-      desc: Этот Атмос, ПРОСТО ИМБА!
-      name: Tallant
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.41453,-84.46243
-      parent: 2
 - proto: PlushieSharkBlue
   entities:
   - uid: 4174
@@ -313729,7 +313752,7 @@ entities:
       desc: Я люблю тебя так сильно, как никто никогда не любил...
       name: Dezzzix
     - type: Transform
-      pos: 6.457911,-83.97781
+      pos: 6.4811482,-84.411995
       parent: 2
 - proto: PlushieSharkPink
   entities:
@@ -313754,7 +313777,7 @@ entities:
       desc: Спи, малышка, пусть приснятся горы и ручьи. Где нет зимы...
       name: Denora
     - type: Transform
-      pos: 6.442286,-83.68094
+      pos: 6.4342732,-84.05262
       parent: 2
   - uid: 62374
     components:
@@ -313982,6 +314005,21 @@ entities:
     - type: Transform
       pos: -62.5,-84.5
       parent: 2
+  - uid: 71275
+    components:
+    - type: Transform
+      pos: 25.5,-64.5
+      parent: 2
+  - uid: 71288
+    components:
+    - type: Transform
+      pos: -11.5,-84.5
+      parent: 2
+  - uid: 71289
+    components:
+    - type: Transform
+      pos: 32.5,-37.5
+      parent: 2
 - proto: PortableGeneratorJrPacmanMachineCircuitboard
   entities:
   - uid: 52090
@@ -325289,11 +325327,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -45.5,-18.5
       parent: 2
-  - uid: 3384
-    components:
-    - type: Transform
-      pos: -29.5,-11.5
-      parent: 2
   - uid: 4713
     components:
     - type: Transform
@@ -327571,6 +327604,12 @@ entities:
     - type: Transform
       pos: -51.5,77.5
       parent: 2
+  - uid: 52632
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-11.5
+      parent: 2
   - uid: 54427
     components:
     - type: Transform
@@ -328157,16 +328196,6 @@ entities:
       parent: 65540
 - proto: PsychBed
   entities:
-  - uid: 5704
-    components:
-    - type: MetaData
-      desc: Кровать с мягкой обивкой.
-      name: 'кушетка '
-    - type: Transform
-      pos: -18.5,56.5
-      parent: 2
-    missingComponents:
-    - Damageable
   - uid: 11564
     components:
     - type: Transform
@@ -331757,6 +331786,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,-63.5
       parent: 2
+  - uid: 14130
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,20.5
+      parent: 2
   - uid: 14565
     components:
     - type: Transform
@@ -333044,6 +333079,12 @@ entities:
     - type: Transform
       pos: 60.5,-71.5
       parent: 2
+  - uid: 52398
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-45.5
+      parent: 2
   - uid: 54430
     components:
     - type: Transform
@@ -334043,6 +334084,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,16.5
       parent: 66965
+  - uid: 71254
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,24.5
+      parent: 2
+  - uid: 71255
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,23.5
+      parent: 2
+  - uid: 71256
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,22.5
+      parent: 2
 - proto: RailingCorner
   entities:
   - uid: 340
@@ -336037,6 +336096,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,-43.5
       parent: 2
+  - uid: 14522
+    components:
+    - type: Transform
+      pos: 11.5,-45.5
+      parent: 2
   - uid: 14703
     components:
     - type: Transform
@@ -338308,28 +338372,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,30.5
       parent: 2
-  - uid: 23639
-    components:
-    - type: Transform
-      pos: 18.5,2.5
-      parent: 2
-  - uid: 23640
-    components:
-    - type: Transform
-      pos: 28.5,2.5
-      parent: 2
-  - uid: 23641
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,-1.5
-      parent: 2
-  - uid: 23642
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,-1.5
-      parent: 2
   - uid: 23661
     components:
     - type: Transform
@@ -338567,6 +338609,26 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,2.5
       parent: 55943
+  - uid: 71333
+    components:
+    - type: Transform
+      pos: 18.5,-1.5
+      parent: 2
+  - uid: 71334
+    components:
+    - type: Transform
+      pos: 18.5,2.5
+      parent: 2
+  - uid: 71335
+    components:
+    - type: Transform
+      pos: 28.5,2.5
+      parent: 2
+  - uid: 71336
+    components:
+    - type: Transform
+      pos: 28.5,-1.5
+      parent: 2
 - proto: RandomProduce
   entities:
   - uid: 10042
@@ -347894,11 +347956,6 @@ entities:
     - type: Transform
       pos: 31.5,-53.5
       parent: 2
-  - uid: 23170
-    components:
-    - type: Transform
-      pos: 31.5,-53.5
-      parent: 2
   - uid: 23239
     components:
     - type: Transform
@@ -347944,11 +348001,6 @@ entities:
     - type: Transform
       pos: 5.5,-90.5
       parent: 2
-  - uid: 25395
-    components:
-    - type: Transform
-      pos: 5.5,-90.5
-      parent: 2
   - uid: 27497
     components:
     - type: Transform
@@ -356104,29 +356156,301 @@ entities:
     - type: Transform
       pos: -37.5,46.5
       parent: 56631
+- proto: SignDirectionalBar
+  entities:
+  - uid: 71282
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,2.6375
+      parent: 2
+  - uid: 71285
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,29.4375
+      parent: 2
+  - uid: 71286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,29.4375
+      parent: 2
+  - uid: 71290
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-14.1625
+      parent: 2
+  - uid: 71320
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,3.6375
+      parent: 2
+- proto: SignDirectionalBridge
+  entities:
+  - uid: 71277
+    components:
+    - type: Transform
+      pos: -41.5,25.4375
+      parent: 2
+  - uid: 71280
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -37.5,2.6375
+      parent: 2
+  - uid: 71341
+    components:
+    - type: Transform
+      pos: 2.5,25.6375
+      parent: 2
+  - uid: 71344
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-1.3625
+      parent: 2
+- proto: SignDirectionalBrig
+  entities:
+  - uid: 23640
+    components:
+    - type: Transform
+      pos: 2.5,-14.5625
+      parent: 2
+  - uid: 71281
+    components:
+    - type: Transform
+      pos: -37.5,2.2375
+      parent: 2
+  - uid: 71293
+    components:
+    - type: Transform
+      pos: -41.5,25.0375
+      parent: 2
+  - uid: 71328
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -59.5,-1.5625
+      parent: 2
+- proto: SignDirectionalChapel
+  entities:
+  - uid: 23641
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,29.2375
+      parent: 2
+  - uid: 71304
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -41.5,52.4375
+      parent: 2
 - proto: SignDirectionalChemistry
   entities:
   - uid: 20360
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 2.5,-42.5
+      pos: 2.47,-42.4025
+      parent: 2
+  - uid: 71303
+    components:
+    - type: Transform
+      pos: 2.47,-23.6025
+      parent: 2
+  - uid: 71307
+    components:
+    - type: Transform
+      pos: -15.535,-2.4025
+      parent: 2
+- proto: SignDirectionalCryo
+  entities:
+  - uid: 71338
+    components:
+    - type: Transform
+      pos: 2.5,-42.3625
       parent: 2
 - proto: SignDirectionalDorms
   entities:
+  - uid: 23170
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-14.7625
+      parent: 2
   - uid: 66612
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5204048,-8.448711
       parent: 65849
+  - uid: 71279
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -41.5,2.2375
+      parent: 2
+  - uid: 71317
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -41.5,25.8375
+      parent: 2
+  - uid: 71329
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,3.4375
+      parent: 2
 - proto: SignDirectionalEng
   entities:
+  - uid: 23642
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -37.5,25.8375
+      parent: 2
   - uid: 66613
     components:
     - type: Transform
       pos: 1.4927117,11.2727165
       parent: 65849
+  - uid: 71301
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-14.1625
+      parent: 2
+  - uid: 71318
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 38.5,2.6375
+      parent: 2
+  - uid: 71323
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-2.1625
+      parent: 2
+- proto: SignDirectionalEvac
+  entities:
+  - uid: 19224
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,3.0375
+      parent: 2
+  - uid: 71258
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -69.5,56.5
+      parent: 2
+  - uid: 71259
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -41.5,52.6375
+      parent: 2
+  - uid: 71260
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,29.4375
+      parent: 2
+  - uid: 71261
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-23.1625
+      parent: 2
+  - uid: 71262
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-2.1625
+      parent: 2
+  - uid: 71263
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,3.8375
+      parent: 2
+  - uid: 71264
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,3.0375
+      parent: 2
+  - uid: 71265
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -59.5,-1.3625
+      parent: 2
+  - uid: 71266
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -60.5,24.6875
+      parent: 2
+  - uid: 71267
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,29.8375
+      parent: 2
+  - uid: 71268
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,3.8375
+      parent: 2
+  - uid: 71269
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,16.3875
+      parent: 2
+  - uid: 71270
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,2.8375
+      parent: 2
+  - uid: 71271
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,25.8375
+      parent: 2
+  - uid: 71272
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,29.8375
+      parent: 2
+  - uid: 71273
+    components:
+    - type: Transform
+      pos: -1.5,48.5
+      parent: 2
+  - uid: 71274
+    components:
+    - type: Transform
+      pos: -8.5,63.4375
+      parent: 2
+  - uid: 71276
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-1.1625
+      parent: 2
 - proto: SignDirectionalExam
   entities:
   - uid: 9089
@@ -356135,6 +356459,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -82.5,9.5
       parent: 2
+  - uid: 71331
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,63.6375
+      parent: 2
 - proto: SignDirectionalFood
   entities:
   - uid: 66614
@@ -356142,14 +356472,356 @@ entities:
     - type: Transform
       pos: 1.5083367,11.5539665
       parent: 65849
+  - uid: 71283
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,2.4375
+      parent: 2
+  - uid: 71284
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,29.6375
+      parent: 2
+  - uid: 71287
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,29.6375
+      parent: 2
+  - uid: 71291
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-14.3625
+      parent: 2
+  - uid: 71321
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,3.4375
+      parent: 2
+- proto: SignDirectionalHop
+  entities:
+  - uid: 9819
+    components:
+    - type: Transform
+      pos: -41.5,25.6375
+      parent: 2
+  - uid: 23639
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-14.5625
+      parent: 2
+  - uid: 71278
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -37.5,2.8375
+      parent: 2
+  - uid: 71309
+    components:
+    - type: Transform
+      pos: 16.5,-2.5625
+      parent: 2
+  - uid: 71310
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,3.6375
+      parent: 2
+  - uid: 71311
+    components:
+    - type: Transform
+      pos: -1.5,25.2375
+      parent: 2
+- proto: SignDirectionalHydro
+  entities:
+  - uid: 71297
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,29.2375
+      parent: 2
+  - uid: 71308
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,29.2375
+      parent: 2
+  - uid: 71316
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,2.8375
+      parent: 2
+  - uid: 71330
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,3.2375
+      parent: 2
+- proto: SignDirectionalJanitor
+  entities:
+  - uid: 71302
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-23.3625
+      parent: 2
+  - uid: 71313
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,25.4375
+      parent: 2
+  - uid: 71314
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -37.5,25.6375
+      parent: 2
+- proto: SignDirectionalLibrary
+  entities:
+  - uid: 71296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,29.4375
+      parent: 2
+  - uid: 71312
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,25.6375
+      parent: 2
 - proto: SignDirectionalMed
   entities:
+  - uid: 23558
+    components:
+    - type: Transform
+      pos: 2.5,-14.7625
+      parent: 2
   - uid: 66615
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5047798,-8.214336
       parent: 65849
+  - uid: 71294
+    components:
+    - type: Transform
+      pos: -41.5,25.2375
+      parent: 2
+  - uid: 71305
+    components:
+    - type: Transform
+      pos: -15.5,-2.7425
+      parent: 2
+  - uid: 71315
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -37.5,2.4375
+      parent: 2
+  - uid: 71332
+    components:
+    - type: Transform
+      pos: 16.5,-2.7625
+      parent: 2
+  - uid: 71339
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,2.2375
+      parent: 2
+  - uid: 71340
+    components:
+    - type: Transform
+      pos: 2.5,25.2375
+      parent: 2
+- proto: SignDirectionalSalvage
+  entities:
+  - uid: 71343
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-1.5625
+      parent: 2
+- proto: SignDirectionalSci
+  entities:
+  - uid: 71299
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-23.5625
+      parent: 2
+  - uid: 71306
+    components:
+    - type: Transform
+      pos: -15.5,-2.3625
+      parent: 2
+  - uid: 71324
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -37.5,25.2375
+      parent: 2
+  - uid: 71326
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-2.3625
+      parent: 2
+  - uid: 71327
+    components:
+    - type: Transform
+      pos: 2.5,25.4375
+      parent: 2
+  - uid: 71342
+    components:
+    - type: Transform
+      pos: 38.5,-1.7625
+      parent: 2
+- proto: SignDirectionalSolar
+  entities:
+  - uid: 15690
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-80.5
+      parent: 2
+  - uid: 16264
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -55.5,-80.5
+      parent: 2
+  - uid: 25054
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -42.5,-80.5
+      parent: 2
+  - uid: 25094
+    components:
+    - type: Transform
+      pos: -64.5,-72.5
+      parent: 2
+  - uid: 52087
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -63.5,-80.5
+      parent: 2
+  - uid: 71350
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -67.5,-84.5
+      parent: 2
+  - uid: 71351
+    components:
+    - type: Transform
+      pos: -72.5,-58.5
+      parent: 2
+  - uid: 71352
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -75.5,73.5
+      parent: 2
+  - uid: 71353
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -81.5,65.5
+      parent: 2
+  - uid: 71354
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -57.5,68.5
+      parent: 2
+  - uid: 71355
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -45.5,76.5
+      parent: 2
+  - uid: 71356
+    components:
+    - type: Transform
+      pos: 29.5,-92.5
+      parent: 2
+  - uid: 71358
+    components:
+    - type: Transform
+      pos: 31.5,-81.5
+      parent: 2
+  - uid: 71361
+    components:
+    - type: Transform
+      pos: 37.5,-68.5
+      parent: 2
+  - uid: 71362
+    components:
+    - type: Transform
+      pos: 46.5,-56.5
+      parent: 2
+  - uid: 71363
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-88.5
+      parent: 2
+  - uid: 71364
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-87.5
+      parent: 2
+- proto: SignDirectionalSupply
+  entities:
+  - uid: 71300
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-14.3625
+      parent: 2
+  - uid: 71319
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,2.4375
+      parent: 2
+  - uid: 71322
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,3.2375
+      parent: 2
+  - uid: 71325
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -37.5,25.4375
+      parent: 2
+  - uid: 71337
+    components:
+    - type: Transform
+      pos: 2.5,25.8375
+      parent: 2
+- proto: SignDirectionalWash
+  entities:
+  - uid: 71295
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,29.6375
+      parent: 2
 - proto: SignDisposalSpace
   entities:
   - uid: 20084
@@ -356341,6 +357013,11 @@ entities:
     - type: Transform
       pos: 35.5,-83.5
       parent: 2
+  - uid: 71298
+    components:
+    - type: Transform
+      pos: -35.5,86.5
+      parent: 2
 - proto: SignEVA
   entities:
   - uid: 6475
@@ -356660,10 +357337,10 @@ entities:
       parent: 2
 - proto: SignNews
   entities:
-  - uid: 23558
+  - uid: 71292
     components:
     - type: Transform
-      pos: -37.5,25.5
+      pos: -31.5,21.5
       parent: 2
 - proto: SignNosmoking
   entities:
@@ -357423,11 +358100,6 @@ entities:
     - type: Transform
       pos: -50.5,2.5
       parent: 2
-  - uid: 52386
-    components:
-    - type: Transform
-      pos: -41.5,2.5
-      parent: 2
   - uid: 52388
     components:
     - type: Transform
@@ -357536,12 +358208,6 @@ entities:
       parent: 56631
 - proto: SinkStemlessWater
   entities:
-  - uid: 5892
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -28.863169,44.5
-      parent: 2
   - uid: 6131
     components:
     - type: Transform
@@ -357594,6 +358260,12 @@ entities:
     - type: Transform
       pos: -1.3,-64.8
       parent: 2
+  - uid: 19225
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.8,44.4375
+      parent: 2
   - uid: 39221
     components:
     - type: Transform
@@ -357635,12 +358307,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -55.5,31.5
       parent: 2
-  - uid: 6818
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -30.5,-11.5
-      parent: 2
   - uid: 6917
     components:
     - type: Transform
@@ -357724,6 +358390,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 15.5,-42.5
       parent: 2
+  - uid: 14505
+    components:
+    - type: Transform
+      pos: -29.5,-11.5
+      parent: 2
   - uid: 17637
     components:
     - type: Transform
@@ -361109,13 +361780,6 @@ entities:
     - type: Transform
       pos: -16.5,15.5
       parent: 56631
-- proto: SpawnMobBoxingKangaroo
-  entities:
-  - uid: 52395
-    components:
-    - type: Transform
-      pos: -32.5,57.5
-      parent: 2
 - proto: SpawnMobButterfly
   entities:
   - uid: 18365
@@ -361644,11 +362308,6 @@ entities:
     - type: Transform
       pos: 72.5,11.5
       parent: 2
-  - uid: 52398
-    components:
-    - type: Transform
-      pos: -0.5,-66.5
-      parent: 2
 - proto: SpawnMobHellspawn
   entities:
   - uid: 63372
@@ -361688,6 +362347,13 @@ entities:
     - type: Transform
       pos: 29.5,59.5
       parent: 56631
+- proto: SpawnMobKangarooWillow
+  entities:
+  - uid: 52395
+    components:
+    - type: Transform
+      pos: -32.5,57.5
+      parent: 2
 - proto: SpawnMobLizard
   entities:
   - uid: 10193
@@ -362582,6 +363248,13 @@ entities:
     - type: Transform
       pos: -42.5,66.5
       parent: 2
+- proto: SpawnPointObserver
+  entities:
+  - uid: 52386
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 2
 - proto: SpawnPointParamedic
   entities:
   - uid: 18846
@@ -373548,20 +374221,26 @@ entities:
       parent: 2
     missingComponents:
     - Damageable
-  - uid: 7362
+  - uid: 12610
     components:
     - type: Transform
-      pos: -18.5,56.5
+      pos: -17.5,56.5
       parent: 2
     missingComponents:
     - Damageable
-  - uid: 12610
+  - uid: 71347
     components:
     - type: Transform
-      pos: -17.5,56.5
+      pos: -18.5,56.5
       parent: 2
-    missingComponents:
-    - Damageable
+    - type: Strap
+      unbuckleSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/unbuckle.ogg
+      buckleSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/buckle.ogg
+      rotation: -1.5707963267948966 rad
+      buckleOffset: 0,0.1
+      position: Down
 - proto: TableCarpet
   entities:
   - uid: 5357
@@ -384749,6 +385428,8 @@ entities:
     - type: Transform
       pos: -25.5,-47.5
       parent: 2
+    - type: AccessReader
+      access: []
 - proto: VendingMachineSnack
   entities:
   - uid: 9258
@@ -455310,7 +455991,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -80715.984
+      secondsUntilStateChange: -100172.164
       state: Opening
   - uid: 21930
     components: