diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index 1a350ae1b1..28147477fa 100644
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -6899,6 +6899,22 @@ entities:
     - pos: 28.5,-21.5
       parent: 4812
       type: Transform
+  - uid: 6064
+    components:
+    - pos: 13.5,-22.5
+      parent: 4812
+      type: Transform
+  - uid: 6118
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 17.5,-16.5
+      parent: 4812
+      type: Transform
+  - uid: 6149
+    components:
+    - pos: 13.5,-16.5
+      parent: 4812
+      type: Transform
   - uid: 6844
     components:
     - pos: -17.5,-31.5
@@ -6946,6 +6962,12 @@ entities:
     - pos: -38.5,6.5
       parent: 4812
       type: Transform
+  - uid: 9412
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 32.5,-29.5
+      parent: 4812
+      type: Transform
   - uid: 10021
     components:
     - pos: -41.5,-4.5
@@ -16538,9 +16560,11 @@ entities:
       type: Fixtures
   - uid: 6031
     components:
-    - pos: 6.5,-20.5
+    - pos: 13.5,-16.5
       parent: 4812
       type: Transform
+    - enabled: True
+      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 6032
@@ -16676,13 +16700,6 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
-  - uid: 6051
-    components:
-    - pos: 13.5,-20.5
-      parent: 4812
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
   - uid: 6052
     components:
     - pos: 13.5,-19.5
@@ -16769,24 +16786,6 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
-  - uid: 6064
-    components:
-    - pos: 13.5,-15.5
-      parent: 4812
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 6065
-    components:
-    - pos: 14.5,-15.5
-      parent: 4812
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
   - uid: 6066
     components:
     - pos: 9.5,-22.5
@@ -17029,9 +17028,11 @@ entities:
       type: Fixtures
   - uid: 6100
     components:
-    - pos: 16.5,-20.5
+    - pos: 10.5,-35.5
       parent: 4812
       type: Transform
+    - enabled: True
+      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 6101
@@ -17157,13 +17158,6 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
-  - uid: 6118
-    components:
-    - pos: 18.5,-27.5
-      parent: 4812
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
   - uid: 6119
     components:
     - pos: 18.5,-28.5
@@ -17396,13 +17390,6 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
-  - uid: 6149
-    components:
-    - pos: 29.5,-25.5
-      parent: 4812
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
   - uid: 6150
     components:
     - pos: 30.5,-25.5
@@ -20085,6 +20072,15 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
+  - uid: 8968
+    components:
+    - pos: 13.5,-22.5
+      parent: 4812
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
   - uid: 9050
     components:
     - pos: -50.5,0.5
@@ -20094,6 +20090,15 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
+  - uid: 9090
+    components:
+    - pos: 32.5,-29.5
+      parent: 4812
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
   - uid: 9288
     components:
     - pos: -38.5,6.5
@@ -21004,6 +21009,15 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
+  - uid: 9523
+    components:
+    - pos: 17.5,-16.5
+      parent: 4812
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
   - uid: 9525
     components:
     - pos: -47.5,-1.5
@@ -23079,15 +23093,6 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
-  - uid: 11275
-    components:
-    - pos: 19.5,-34.5
-      parent: 4812
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
   - uid: 11276
     components:
     - pos: 19.5,-35.5
@@ -31350,6 +31355,20 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
+  - uid: 6051
+    components:
+    - pos: 13.5,-21.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 6065
+    components:
+    - pos: 28.5,-23.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 6640
     components:
     - pos: -26.5,-25.5
@@ -32630,6 +32649,20 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
+  - uid: 8853
+    components:
+    - pos: 13.5,-19.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 8858
+    components:
+    - pos: 13.5,-18.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 8878
     components:
     - pos: -24.5,-10.5
@@ -32829,6 +32862,103 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
+  - uid: 8902
+    components:
+    - pos: 13.5,-17.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 8906
+    components:
+    - pos: 13.5,-16.5
+      parent: 4812
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
+  - uid: 8967
+    components:
+    - pos: 13.5,-22.5
+      parent: 4812
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
+  - uid: 8969
+    components:
+    - pos: 28.5,-24.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 8971
+    components:
+    - pos: 28.5,-25.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 8972
+    components:
+    - pos: 29.5,-25.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 8973
+    components:
+    - pos: 30.5,-25.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 8974
+    components:
+    - pos: 31.5,-25.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 8975
+    components:
+    - pos: 32.5,-25.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 8976
+    components:
+    - pos: 32.5,-26.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 9014
+    components:
+    - pos: 32.5,-27.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 9074
+    components:
+    - pos: 32.5,-28.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 9089
+    components:
+    - pos: 32.5,-29.5
+      parent: 4812
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
   - uid: 9287
     components:
     - pos: -38.5,7.5
@@ -32845,6 +32975,49 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
+  - uid: 9524
+    components:
+    - pos: 16.5,-19.5
+      parent: 4812
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 9580
+    components:
+    - pos: 16.5,-18.5
+      parent: 4812
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
+  - uid: 9581
+    components:
+    - pos: 16.5,-17.5
+      parent: 4812
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
+  - uid: 9582
+    components:
+    - pos: 16.5,-16.5
+      parent: 4812
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
+  - uid: 9583
+    components:
+    - pos: 17.5,-16.5
+      parent: 4812
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
   - uid: 10001
     components:
     - pos: -34.5,-20.5