omega update (#23362)

diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index 876aafebf5c3f9bd14d792cb889c1b7c27150be8..cff8896394b51d10d0d8d4a570ea7b77fe087efd 100644 (file)
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -11084,6 +11084,11 @@ entities:
     - pos: -17.5,-0.5\r
       parent: 4812\r
       type: Transform\r
+  - uid: 744\r
+    components:\r
+    - pos: -25.5,-28.5\r
+      parent: 4812\r
+      type: Transform\r
   - uid: 1256\r
     components:\r
     - pos: -17.5,4.5\r
@@ -11124,11 +11129,6 @@ entities:
     - pos: -30.5,-21.5\r
       parent: 4812\r
       type: Transform\r
-  - uid: 7455\r
-    components:\r
-    - pos: -24.5,-28.5\r
-      parent: 4812\r
-      type: Transform\r
   - uid: 7575\r
     components:\r
     - pos: -20.5,-20.5\r
@@ -11178,9 +11178,9 @@ entities:
       type: Transform\r
 - proto: BedsheetCMO\r
   entities:\r
-  - uid: 7456\r
+  - uid: 2501\r
     components:\r
-    - pos: -24.5,-28.5\r
+    - pos: -25.5,-28.5\r
       parent: 4812\r
       type: Transform\r
 - proto: BedsheetCult\r
@@ -31812,6 +31812,13 @@ entities:
     - pos: 13.532155,-11.236504\r
       parent: 4812\r
       type: Transform\r
+- proto: ClothingHeadHatBeretWarden\r
+  entities:\r
+  - uid: 12145\r
+    components:\r
+    - pos: -35.744057,17.561283\r
+      parent: 4812\r
+      type: Transform\r
 - proto: ClothingHeadHatCone\r
   entities:\r
   - uid: 11339\r
@@ -33985,6 +33992,20 @@ entities:
     - pos: -9.581426,-1.3989067\r
       parent: 4812\r
       type: Transform\r
+- proto: DefaultStationBeaconAICore\r
+  entities:\r
+  - uid: 12477\r
+    components:\r
+    - pos: 10.5,53.5\r
+      parent: 4812\r
+      type: Transform\r
+- proto: DefaultStationBeaconAISatellite\r
+  entities:\r
+  - uid: 12478\r
+    components:\r
+    - pos: 6.5,46.5\r
+      parent: 4812\r
+      type: Transform\r
 - proto: DefaultStationBeaconAME\r
   entities:\r
   - uid: 9615\r
@@ -34139,6 +34160,13 @@ entities:
     - pos: -31.5,-1.5\r
       parent: 4812\r
       type: Transform\r
+- proto: DefaultStationBeaconEvac\r
+  entities:\r
+  - uid: 12480\r
+    components:\r
+    - pos: 28.5,-2.5\r
+      parent: 4812\r
+      type: Transform\r
 - proto: DefaultStationBeaconEVAStorage\r
   entities:\r
   - uid: 12334\r
@@ -36835,11 +36863,6 @@ entities:
       type: Transform\r
 - proto: Dresser\r
   entities:\r
-  - uid: 744\r
-    components:\r
-    - pos: -12.5,29.5\r
-      parent: 4812\r
-      type: Transform\r
   - uid: 1254\r
     components:\r
     - pos: -17.5,5.5\r
@@ -36850,11 +36873,6 @@ entities:
     - pos: -7.5,0.5\r
       parent: 4812\r
       type: Transform\r
-  - uid: 2501\r
-    components:\r
-    - pos: 7.5,29.5\r
-      parent: 4812\r
-      type: Transform\r
   - uid: 5363\r
     components:\r
     - pos: 19.5,-11.5\r
@@ -36865,14 +36883,51 @@ entities:
     - pos: -27.5,-37.5\r
       parent: 4812\r
       type: Transform\r
-  - uid: 8251\r
+  - uid: 9046\r
+    components:\r
+    - pos: -26.5,-40.5\r
+      parent: 4812\r
+      type: Transform\r
+- proto: DresserCaptainFilled\r
+  entities:\r
+  - uid: 7064\r
+    components:\r
+    - pos: -12.5,29.5\r
+      parent: 4812\r
+      type: Transform\r
+- proto: DresserChiefEngineerFilled\r
+  entities:\r
+  - uid: 12479\r
+    components:\r
+    - pos: -48.5,-7.5\r
+      parent: 4812\r
+      type: Transform\r
+- proto: DresserChiefMedicalOfficerFilled\r
+  entities:\r
+  - uid: 7461\r
+    components:\r
+    - pos: -24.5,-28.5\r
+      parent: 4812\r
+      type: Transform\r
+- proto: DresserHeadOfPersonnelFilled\r
+  entities:\r
+  - uid: 7455\r
+    components:\r
+    - pos: 7.5,29.5\r
+      parent: 4812\r
+      type: Transform\r
+- proto: DresserHeadOfSecurityFilled\r
+  entities:\r
+  - uid: 7456\r
     components:\r
     - pos: -23.5,28.5\r
       parent: 4812\r
       type: Transform\r
-  - uid: 9046\r
+- proto: DresserQuarterMasterFilled\r
+  entities:\r
+  - uid: 12476\r
     components:\r
-    - pos: -26.5,-40.5\r
+    - pos: 16.5,35.5\r
       parent: 4812\r
       type: Transform\r
 - proto: DrinkBottleOfNothingFull\r
@@ -57658,11 +57713,6 @@ entities:
     - pos: 19.5,36.5\r
       parent: 4812\r
       type: Transform\r
-  - uid: 7461\r
-    components:\r
-    - pos: -24.5,-28.5\r
-      parent: 4812\r
-      type: Transform\r
 - proto: hydroponicsSoil\r
   entities:\r
   - uid: 8385\r
@@ -62750,14 +62800,6 @@ entities:
       pos: -22.5,-28.5\r
       parent: 4812\r
       type: Transform\r
-  - uid: 7064\r
-    components:\r
-    - flags: PvsPriority\r
-      type: MetaData\r
-    - rot: 3.141592653589793 rad\r
-      pos: -25.5,-28.5\r
-      parent: 4812\r
-      type: Transform\r
   - uid: 7288\r
     components:\r
     - flags: PvsPriority\r
@@ -62971,6 +63013,14 @@ entities:
       type: Transform\r
     - powerLoad: 0\r
       type: ApcPowerReceiver\r
+  - uid: 8251\r
+    components:\r
+    - flags: PvsPriority\r
+      type: MetaData\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -24.5,-27.5\r
+      parent: 4812\r
+      type: Transform\r
   - uid: 8269\r
     components:\r
     - flags: PvsPriority\r
@@ -69684,28 +69734,6 @@ entities:
     - pos: -11.5,-14.5\r
       parent: 4812\r
       type: Transform\r
-- proto: SpawnPointAssistant\r
-  entities:\r
-  - uid: 12382\r
-    components:\r
-    - pos: -19.5,8.5\r
-      parent: 4812\r
-      type: Transform\r
-  - uid: 12383\r
-    components:\r
-    - pos: -18.5,11.5\r
-      parent: 4812\r
-      type: Transform\r
-  - uid: 12384\r
-    components:\r
-    - pos: -17.5,9.5\r
-      parent: 4812\r
-      type: Transform\r
-  - uid: 12385\r
-    components:\r
-    - pos: -20.5,10.5\r
-      parent: 4812\r
-      type: Transform\r
 - proto: SpawnPointAtmos\r
   entities:\r
   - uid: 3259\r
@@ -69949,6 +69977,28 @@ entities:
     - pos: -2.5,2.5\r
       parent: 4812\r
       type: Transform\r
+- proto: SpawnPointPassenger\r
+  entities:\r
+  - uid: 12382\r
+    components:\r
+    - pos: -19.5,8.5\r
+      parent: 4812\r
+      type: Transform\r
+  - uid: 12383\r
+    components:\r
+    - pos: -18.5,11.5\r
+      parent: 4812\r
+      type: Transform\r
+  - uid: 12384\r
+    components:\r
+    - pos: -17.5,9.5\r
+      parent: 4812\r
+      type: Transform\r
+  - uid: 12385\r
+    components:\r
+    - pos: -20.5,10.5\r
+      parent: 4812\r
+      type: Transform\r
 - proto: SpawnPointQuartermaster\r
   entities:\r
   - uid: 3449\r
@@ -85655,76 +85705,6 @@ entities:
       type: Transform\r
 - proto: WarpPoint\r
   entities:\r
-  - uid: 12145\r
-    components:\r
-    - pos: -16.5,-34.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: chapel\r
-      type: WarpPoint\r
-  - uid: 12476\r
-    components:\r
-    - pos: -10.5,-21.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: medbay\r
-      type: WarpPoint\r
-  - uid: 12477\r
-    components:\r
-    - pos: -28.5,-16.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: library\r
-      type: WarpPoint\r
-  - uid: 12478\r
-    components:\r
-    - pos: -32.5,-2.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: engi\r
-      type: WarpPoint\r
-  - uid: 12479\r
-    components:\r
-    - pos: -20.5,1.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: dorms\r
-      type: WarpPoint\r
-  - uid: 12480\r
-    components:\r
-    - pos: -29.5,15.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: security\r
-      type: WarpPoint\r
-  - uid: 12481\r
-    components:\r
-    - pos: -2.5,31.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: bridge\r
-      type: WarpPoint\r
-  - uid: 12482\r
-    components:\r
-    - pos: 10.5,49.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: ai core\r
-      type: WarpPoint\r
-  - uid: 12483\r
-    components:\r
-    - pos: 16.5,20.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: cargo\r
-      type: WarpPoint\r
-  - uid: 12484\r
-    components:\r
-    - pos: 28.5,-2.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: evac\r
-      type: WarpPoint\r
   - uid: 12485\r
     components:\r
     - pos: 8.5,-21.5\r
@@ -85732,20 +85712,6 @@ entities:
       type: Transform\r
     - location: sci\r
       type: WarpPoint\r
-  - uid: 12486\r
-    components:\r
-    - pos: -2.5,0.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: service\r
-      type: WarpPoint\r
-  - uid: 12517\r
-    components:\r
-    - pos: 33.5,-25.5\r
-      parent: 4812\r
-      type: Transform\r
-    - location: anomaly Lab\r
-      type: WarpPoint\r
 - proto: WaterCooler\r
   entities:\r
   - uid: 2673\r