omega update (#31808)

diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index 22759947e8ac533759a220839402f14a08b4ad2b..7859f5f51128c0798c9f2ab6c779a3ad085adf6c 100644 (file)
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -20,6 +20,7 @@ tilemap:
   62: FloorLino
   69: FloorMono
   77: FloorReinforced
+  1: FloorRockVault
   80: FloorShowroom
   89: FloorSteel
   104: FloorTechMaint
@@ -54,7 +55,7 @@ entities:
       chunks:
         -1,0:
           ind: -1,0
-          tiles: PgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAAAdgAAAAACHQAAAAADeQAAAAAADgAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAACdgAAAAACHQAAAAABeQAAAAAADgAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAADgAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAACaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAABdgAAAAABdgAAAAAAHQAAAAABDgAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAADWQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABdgAAAAADdgAAAAACdgAAAAAAHQAAAAADDgAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAADWQAAAAACaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAABdgAAAAABdgAAAAACHQAAAAACDgAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAADdgAAAAADdgAAAAAAHQAAAAACDgAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAAAdgAAAAACdgAAAAADHQAAAAACDgAAAAADWQAAAAABWQAAAAABWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAADdgAAAAAAdgAAAAADHQAAAAAADgAAAAABWQAAAAADWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAADdgAAAAAAdgAAAAADHQAAAAAADgAAAAACDgAAAAABWQAAAAADWQAAAAAAWQAAAAACDgAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABDgAAAAADWQAAAAACWQAAAAADWQAAAAAADgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABDgAAAAACDgAAAAAADgAAAAACDgAAAAACDgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAADgAAAAABDgAAAAABDgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAAAeQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAAAeQAAAAAA
+          tiles: PgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAAAdgAAAAACHQAAAAADeQAAAAAADgAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAACdgAAAAACHQAAAAABeQAAAAAADgAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAADgAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAACaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAABdgAAAAABdgAAAAAAHQAAAAABDgAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAADWQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABdgAAAAADdgAAAAACdgAAAAAAHQAAAAADDgAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAADWQAAAAACaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAABdgAAAAABdgAAAAACHQAAAAACDgAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAADdgAAAAADdgAAAAAAHQAAAAACDgAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAAAdgAAAAACdgAAAAADHQAAAAACDgAAAAADWQAAAAABWQAAAAABWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAADdgAAAAAAdgAAAAADHQAAAAAADgAAAAABWQAAAAADWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAADdgAAAAAAdgAAAAADHQAAAAAADgAAAAACDgAAAAABWQAAAAADWQAAAAAAWQAAAAACDgAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABDgAAAAADWQAAAAACWQAAAAADWQAAAAAADgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABDgAAAAACDgAAAAAADgAAAAACDgAAAAACDgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAADgAAAAABDgAAAAABDgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAAAeQAAAAAA
           version: 6
         0,0:
           ind: 0,0
@@ -62,7 +63,7 @@ entities:
           version: 6
         -1,1:
           ind: -1,1
-          tiles: eQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAAAeQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAAAWQAAAAADWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAADWQAAAAABWQAAAAABWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAHQAAAAABHQAAAAACeQAAAAAAHQAAAAADNgAAAAAANgAAAAAAHQAAAAABNgAAAAAANgAAAAAAHQAAAAABdgAAAAABdgAAAAAAdgAAAAADdgAAAAAAdgAAAAABdgAAAAACHQAAAAADHQAAAAADeQAAAAAAHQAAAAACNgAAAAAAHQAAAAACHQAAAAABHQAAAAADNgAAAAAAHQAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAACdgAAAAABeQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAHQAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAHQAAAAABeQAAAAAAdgAAAAAAdgAAAAACdgAAAAAAdgAAAAACeQAAAAAAHQAAAAABHQAAAAABeQAAAAAAHQAAAAADNgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADNgAAAAAAHQAAAAADHQAAAAACUAAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAADeQAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALAAAAAAALAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAAAHQAAAAABHQAAAAACHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAALAAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAAAHQAAAAACHQAAAAAD
+          tiles: eQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAAAeQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAAQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAAAWQAAAAADWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAADWQAAAAABWQAAAAABWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAHQAAAAABHQAAAAACeQAAAAAAHQAAAAADNgAAAAAANgAAAAAAHQAAAAABNgAAAAAANgAAAAAAHQAAAAABdgAAAAABdgAAAAAAdgAAAAADdgAAAAAAdgAAAAABdgAAAAACHQAAAAADHQAAAAADeQAAAAAAHQAAAAACNgAAAAAAHQAAAAACHQAAAAABHQAAAAADNgAAAAAAHQAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAACdgAAAAABeQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAHQAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAHQAAAAABeQAAAAAAdgAAAAAAdgAAAAACdgAAAAAAdgAAAAACeQAAAAAAHQAAAAABHQAAAAABeQAAAAAAHQAAAAADNgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADNgAAAAAAHQAAAAADHQAAAAACUAAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAADeQAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALAAAAAAALAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAAAHQAAAAABHQAAAAACHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAALAAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAAAHQAAAAACHQAAAAAD
           version: 6
         0,1:
           ind: 0,1
@@ -7107,6 +7108,13 @@ entities:
     - type: Transform
       pos: 31.63529,-24.472576
       parent: 4812
+- proto: AntimovCircuitBoard
+  entities:
+  - uid: 12641
+    components:
+    - type: Transform
+      pos: 9.371053,43.6508
+      parent: 4812
 - proto: APCBasic
   entities:
   - uid: 903
@@ -7403,6 +7411,20 @@ entities:
     - type: Transform
       pos: -31.531736,31.32598
       parent: 4812
+- proto: ArtistCircuitBoard
+  entities:
+  - uid: 12642
+    components:
+    - type: Transform
+      pos: 9.402303,43.5883
+      parent: 4812
+- proto: AsimovCircuitBoard
+  entities:
+  - uid: 12644
+    components:
+    - type: Transform
+      pos: 9.542928,43.4008
+      parent: 4812
 - proto: AsteroidRock
   entities:
   - uid: 2840
@@ -10152,11 +10174,6 @@ entities:
       parent: 4812
 - proto: Bookshelf
   entities:
-  - uid: 1952
-    components:
-    - type: Transform
-      pos: -13.5,25.5
-      parent: 4812
   - uid: 5374
     components:
     - type: Transform
@@ -10335,10 +10352,10 @@ entities:
       parent: 4812
 - proto: BoxFlashbang
   entities:
-  - uid: 8368
+  - uid: 8369
     components:
     - type: Transform
-      pos: -36.5,17.5
+      pos: -36.42858,16.41507
       parent: 4812
   - uid: 8430
     components:
@@ -10426,10 +10443,10 @@ entities:
       parent: 4812
 - proto: BoxHandcuff
   entities:
-  - uid: 8369
+  - uid: 2727
     components:
     - type: Transform
-      pos: -36.509842,17.041077
+      pos: -36.64733,16.47757
       parent: 4812
   - uid: 8431
     components:
@@ -30322,6 +30339,18 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ClothingOuterHardsuitSecurity
+  entities:
+  - uid: 10602
+    components:
+    - type: Transform
+      pos: -36.600456,17.618195
+      parent: 4812
+  - uid: 12429
+    components:
+    - type: Transform
+      pos: -36.45983,17.524445
+      parent: 4812
 - proto: ClothingOuterHardsuitSpatio
   entities:
   - uid: 12424
@@ -30774,6 +30803,20 @@ entities:
     - type: Transform
       pos: -14.5,0.5
       parent: 4812
+- proto: CommandmentCircuitBoard
+  entities:
+  - uid: 12653
+    components:
+    - type: Transform
+      pos: 11.589803,43.5258
+      parent: 4812
+- proto: CommsComputerCircuitboard
+  entities:
+  - uid: 2730
+    components:
+    - type: Transform
+      pos: 22.5,8.5
+      parent: 4812
 - proto: ComputerAlert
   entities:
   - uid: 2708
@@ -30940,11 +30983,6 @@ entities:
       parent: 4812
 - proto: ComputerFrame
   entities:
-  - uid: 3951
-    components:
-    - type: Transform
-      pos: 7.5,47.5
-      parent: 4812
   - uid: 6653
     components:
     - type: Transform
@@ -31213,6 +31251,13 @@ entities:
     - type: Transform
       pos: -42.51349,-28.44041
       parent: 4812
+- proto: CorporateCircuitBoard
+  entities:
+  - uid: 12643
+    components:
+    - type: Transform
+      pos: 9.464803,43.510174
+      parent: 4812
 - proto: CrateArtifactContainer
   entities:
   - uid: 7366
@@ -35009,6 +35054,13 @@ entities:
     - type: Transform
       pos: -13.459903,-33.042583
       parent: 4812
+- proto: DungeonMasterCircuitBoard
+  entities:
+  - uid: 12645
+    components:
+    - type: Transform
+      pos: 9.589803,43.291424
+      parent: 4812
 - proto: ElectricGuitarInstrument
   entities:
   - uid: 1720
@@ -51754,6 +51806,13 @@ entities:
     - type: Transform
       pos: -13.5,11.5
       parent: 4812
+- proto: GlassBoxLaserFilled
+  entities:
+  - uid: 1952
+    components:
+    - type: Transform
+      pos: -13.5,25.5
+      parent: 4812
 - proto: GravityGenerator
   entities:
   - uid: 9889
@@ -55163,6 +55222,13 @@ entities:
     - type: Transform
       pos: -16.5,-5.5
       parent: 4812
+- proto: IDComputerCircuitboard
+  entities:
+  - uid: 8335
+    components:
+    - type: Transform
+      pos: 21.5,8.5
+      parent: 4812
 - proto: InflatableDoorStack
   entities:
   - uid: 9679
@@ -55795,6 +55861,13 @@ entities:
     - type: Transform
       pos: -23.51768,-6.333922
       parent: 4812
+- proto: LiveLetLiveCircuitBoard
+  entities:
+  - uid: 12646
+    components:
+    - type: Transform
+      pos: 9.339803,43.5883
+      parent: 4812
 - proto: LockerAtmosphericsFilled
   entities:
   - uid: 9570
@@ -55893,31 +55966,13 @@ entities:
         - 0
         - 0
         - 0
-- proto: LockerCaptainFilled
+- proto: LockerCaptainFilledNoLaser
   entities:
-  - uid: 2595
+  - uid: 2729
     components:
     - type: Transform
       pos: -10.5,28.5
       parent: 4812
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14957
-        moles:
-        - 1.6033952
-        - 6.031821
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: LockerChemistryFilled
   entities:
   - uid: 6609
@@ -56839,6 +56894,13 @@ entities:
     - type: Transform
       pos: 7.701914,-15.330456
       parent: 4812
+- proto: MechEquipmentGrabberSmall
+  entities:
+  - uid: 3442
+    components:
+    - type: Transform
+      pos: 19.5,21.5
+      parent: 4812
 - proto: MedicalBed
   entities:
   - uid: 7572
@@ -57086,6 +57148,13 @@ entities:
     - type: Transform
       pos: 21.5,-32.5
       parent: 4812
+- proto: NTDefaultCircuitBoard
+  entities:
+  - uid: 12647
+    components:
+    - type: Transform
+      pos: 9.464803,43.385174
+      parent: 4812
 - proto: NuclearBomb
   entities:
   - uid: 1854
@@ -57100,6 +57169,13 @@ entities:
     - type: Transform
       pos: 16.5,-44.5
       parent: 4812
+- proto: NutimovCircuitBoard
+  entities:
+  - uid: 12648
+    components:
+    - type: Transform
+      pos: 11.417928,43.6508
+      parent: 4812
 - proto: OperatingTable
   entities:
   - uid: 6167
@@ -57144,6 +57220,13 @@ entities:
     - type: Transform
       pos: -53.373444,-16.451925
       parent: 4812
+- proto: OverlordCircuitBoard
+  entities:
+  - uid: 12649
+    components:
+    - type: Transform
+      pos: 11.511678,43.5883
+      parent: 4812
 - proto: OxygenCanister
   entities:
   - uid: 733
@@ -57262,6 +57345,13 @@ entities:
     - type: Transform
       pos: -28.5,-13.5
       parent: 4812
+- proto: PaladinCircuitBoard
+  entities:
+  - uid: 12650
+    components:
+    - type: Transform
+      pos: 11.589803,43.49455
+      parent: 4812
 - proto: Paper
   entities:
   - uid: 2520
@@ -57811,6 +57901,13 @@ entities:
     - type: Transform
       pos: -32.5,0.5
       parent: 4812
+- proto: PlayerStationAi
+  entities:
+  - uid: 10457
+    components:
+    - type: Transform
+      pos: 10.5,52.5
+      parent: 4812
 - proto: PlushieBee
   entities:
   - uid: 11334
@@ -60780,6 +60877,11 @@ entities:
       - Gold
 - proto: ProtolatheMachineCircuitboard
   entities:
+  - uid: 3951
+    components:
+    - type: Transform
+      pos: 23.5,8.5
+      parent: 4812
   - uid: 4495
     components:
     - type: Transform
@@ -60797,6 +60899,11 @@ entities:
     - type: Transform
       pos: 3.5,14.5
       parent: 4812
+  - uid: 2595
+    components:
+    - type: Transform
+      pos: -36.5,17.5
+      parent: 4812
   - uid: 2699
     components:
     - type: Transform
@@ -60820,7 +60927,7 @@ entities:
   - uid: 3289
     components:
     - type: Transform
-      pos: 23.5,7.5
+      pos: 22.5,8.5
       parent: 4812
   - uid: 3392
     components:
@@ -60837,11 +60944,6 @@ entities:
     - type: Transform
       pos: -47.5,-13.5
       parent: 4812
-  - uid: 3442
-    components:
-    - type: Transform
-      pos: 21.5,7.5
-      parent: 4812
   - uid: 3748
     components:
     - type: Transform
@@ -60992,6 +61094,16 @@ entities:
     - type: Transform
       pos: 4.5,12.5
       parent: 4812
+  - uid: 12634
+    components:
+    - type: Transform
+      pos: 9.5,43.5
+      parent: 4812
+  - uid: 12635
+    components:
+    - type: Transform
+      pos: 11.5,43.5
+      parent: 4812
 - proto: RadioHandheld
   entities:
   - uid: 4582
@@ -61072,26 +61184,6 @@ entities:
     - type: Transform
       pos: 25.5,4.5
       parent: 4812
-  - uid: 2727
-    components:
-    - type: Transform
-      pos: 21.5,7.5
-      parent: 4812
-  - uid: 2728
-    components:
-    - type: Transform
-      pos: 23.5,7.5
-      parent: 4812
-  - uid: 2729
-    components:
-    - type: Transform
-      pos: 23.5,8.5
-      parent: 4812
-  - uid: 2730
-    components:
-    - type: Transform
-      pos: 21.5,8.5
-      parent: 4812
   - uid: 3286
     components:
     - type: Transform
@@ -63720,6 +63812,13 @@ entities:
     - type: Transform
       pos: -14.491153,4.5839243
       parent: 4812
+- proto: RobocopCircuitBoard
+  entities:
+  - uid: 12651
+    components:
+    - type: Transform
+      pos: 11.636678,43.4008
+      parent: 4812
 - proto: RockGuitarInstrument
   entities:
   - uid: 12366
@@ -65955,6 +66054,13 @@ entities:
     - type: Transform
       pos: 53.5,-36.5
       parent: 4812
+- proto: SpawnMechRipley
+  entities:
+  - uid: 8368
+    components:
+    - type: Transform
+      pos: 20.5,19.5
+      parent: 4812
 - proto: SpawnMobAlexander
   entities:
   - uid: 12426
@@ -66475,6 +66581,13 @@ entities:
     - type: Transform
       pos: -17.5,-20.5
       parent: 4812
+- proto: StationAiUploadComputer
+  entities:
+  - uid: 2728
+    components:
+    - type: Transform
+      pos: 7.5,47.5
+      parent: 4812
 - proto: StationAnchor
   entities:
   - uid: 10438
@@ -66482,6 +66595,13 @@ entities:
     - type: Transform
       pos: -48.5,-16.5
       parent: 4812
+- proto: StationEfficiencyCircuitBoard
+  entities:
+  - uid: 12652
+    components:
+    - type: Transform
+      pos: 11.730428,43.291424
+      parent: 4812
 - proto: StationMap
   entities:
   - uid: 3772
@@ -69138,11 +69258,6 @@ entities:
     - type: Transform
       pos: -36.5,16.5
       parent: 4812
-  - uid: 8335
-    components:
-    - type: Transform
-      pos: -36.5,17.5
-      parent: 4812
   - uid: 8343
     components:
     - type: Transform
@@ -79325,6 +79440,16 @@ entities:
     - type: Transform
       pos: -33.4461,20.218811
       parent: 4812
+  - uid: 12631
+    components:
+    - type: Transform
+      pos: -33.43493,20.166264
+      parent: 4812
+  - uid: 12632
+    components:
+    - type: Transform
+      pos: -33.388054,20.103764
+      parent: 4812
 - proto: WeaponShotgunKammerer
   entities:
   - uid: 12052
@@ -79622,6 +79747,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,53.5
       parent: 4812
+  - uid: 12633
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,43.5
+      parent: 4812
+  - uid: 12636
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,43.5
+      parent: 4812
+  - uid: 12637
+    components:
+    - type: Transform
+      pos: 7.5,47.5
+      parent: 4812
 - proto: WindoorSecureEngineeringLocked
   entities:
   - uid: 8689
@@ -80173,6 +80315,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -15.5,4.5
       parent: 4812
+  - uid: 12638
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,47.5
+      parent: 4812
+  - uid: 12639
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,43.5
+      parent: 4812
+  - uid: 12640
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,43.5
+      parent: 4812
 - proto: WoodDoor
   entities:
   - uid: 6795

diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml
index 787c91be5e131696e0cc9e174b08b9f03da224d2..f07391bd4f6127017d26de9fc53ce3b7a5126435 100644 (file)
--- a/Resources/Prototypes/Maps/omega.yml
+++ b/Resources/Prototypes/Maps/omega.yml
@@ -57,4 +57,6 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
+            #silicon
+            StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]