diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml
index f4bea6b0b1..f85f7b433c 100644
--- a/Resources/Maps/lighthouse.yml
+++ b/Resources/Maps/lighthouse.yml
@@ -6823,7 +6823,7 @@ entities:
           color: '#D3BC37C8'
           id: Grassc2
           coordinates: 0,-3
-        2228:
+        2203:
           color: '#A46106FF'
           id: Remains
           coordinates: 23,-30
@@ -9398,7 +9398,7 @@ entities:
           color: '#FFFFFFFF'
           id: DirtLight
           coordinates: 0,25
-        2226:
+        2202:
           color: '#A46106FF'
           id: Remains
           coordinates: 24,22
@@ -9569,171 +9569,171 @@ entities:
           color: '#FFFFFFFF'
           id: Box
           coordinates: 0,-53
-        2166:
-          color: '#000000FF'
-          id: largebrush
-          coordinates: 11,-60
-        2165:
+        2159:
           color: '#000000FF'
           id: largebrush
           coordinates: 11,-59
-        2167:
+        2160:
+          color: '#000000FF'
+          id: largebrush
+          coordinates: 11,-60
+        2161:
           color: '#000000FF'
           id: largebrush
           coordinates: 16,-57
-        2171:
+        2162:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 19,-58
-        2172:
+        2163:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 18,-58
-        2173:
+        2164:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 17,-58
-        2174:
+        2165:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 16,-58
-        2175:
+        2166:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 16,-59
-        2176:
+        2167:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 17,-59
-        2177:
+        2168:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 17,-60
-        2178:
+        2169:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 16,-60
-        2179:
+        2170:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 16,-61
-        2180:
+        2171:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 17,-61
-        2182:
+        2172:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 18,-60
-        2183:
+        2173:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 19,-59
-        2184:
+        2174:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 18,-59
-        2185:
+        2175:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 20,-59
-        2186:
+        2176:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 20,-58
-        2187:
+        2177:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 16,-58
-        2188:
+        2178:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 15,-59
-        2189:
+        2179:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 15,-60
-        2190:
+        2180:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 14,-60
-        2191:
+        2181:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 14,-61
-        2192:
+        2182:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 13,-61
-        2193:
+        2183:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 12,-61
-        2194:
+        2184:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 12,-60
-        2195:
+        2185:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 13,-60
-        2196:
+        2186:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 13,-59
-        2197:
+        2187:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 14,-59
-        2198:
+        2188:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 14,-58
-        2199:
+        2189:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 13,-58
-        2200:
+        2190:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 12,-58
-        2201:
+        2191:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 12,-59
-        2202:
+        2192:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 10,-61
-        2203:
+        2193:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 10,-60
-        2204:
+        2194:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 10,-59
-        2205:
+        2195:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 10,-58
-        2206:
+        2196:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 9,-58
-        2207:
+        2197:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 9,-57
-        2208:
+        2198:
           color: '#FFFFFFFF'
           id: DirtHeavy
           coordinates: 10,-57
-        2223:
+        2199:
           color: '#A4610696'
           id: Remains
           coordinates: 18,-60
-        2224:
+        2200:
           color: '#A46106FF'
           id: Remains
           coordinates: 18,-60
@@ -10043,7 +10043,7 @@ entities:
           id: DirtMedium
           coordinates: -51,65
       -1,-3:
-        2225:
+        2201:
           color: '#A46106FF'
           id: Remains
           coordinates: -13,-70
@@ -13483,9 +13483,9 @@ entities:
       -29,26: 0
       -29,27: 0
       -29,28: 0
-      -29,29: 0
-      -29,30: 0
-      -29,31: 0
+      -29,29: 1
+      -29,30: 1
+      -29,31: 1
       -28,20: 0
       -28,21: 0
       -28,22: 0
@@ -13495,9 +13495,9 @@ entities:
       -28,26: 0
       -28,27: 0
       -28,28: 0
-      -28,29: 0
-      -28,30: 0
-      -28,31: 0
+      -28,29: 1
+      -28,30: 1
+      -28,31: 1
       -27,21: 0
       -27,22: 0
       -27,23: 0
@@ -13508,7 +13508,7 @@ entities:
       -27,28: 0
       -27,29: 0
       -27,30: 0
-      -27,31: 0
+      -27,31: 1
       -26,22: 0
       -26,23: 0
       -26,24: 0
@@ -18817,7 +18817,7 @@ entities:
       -10,-49: 0
       -9,-50: 0
       -8,-54: 0
-      -8,-53: 1
+      -8,-53: 2
       -8,-52: 0
       -8,-51: 0
       -8,-50: 0
@@ -19577,18 +19577,18 @@ entities:
       -10,-55: 0
       -10,-54: 0
       -9,-58: 0
-      -9,-57: 2
+      -9,-57: 3
       -9,-56: 0
-      -9,-55: 3
+      -9,-55: 4
       -9,-54: 0
       -8,-58: 0
-      -8,-57: 2
+      -8,-57: 3
       -8,-56: 0
-      -8,-55: 3
+      -8,-55: 4
       -7,-58: 0
-      -7,-57: 2
+      -7,-57: 3
       -7,-56: 0
-      -7,-55: 3
+      -7,-55: 4
       -79,27: 0
       -78,26: 0
       -78,27: 0
@@ -19762,7 +19762,7 @@ entities:
       -26,-59: 0
       -26,-58: 0
       -26,-57: 0
-      -25,-57: 4
+      -25,-57: 5
       -55,-58: 0
       -55,-55: 0
       -54,-58: 0
@@ -20898,8 +20898,8 @@ entities:
       -9,-62: 0
       -9,-61: 0
       -9,-60: 0
-      -9,-59: 4
-      -9,-53: 1
+      -9,-59: 5
+      -9,-53: 2
       -9,-52: 0
       -9,-51: 0
       -8,-64: 0
@@ -20907,15 +20907,15 @@ entities:
       -8,-62: 0
       -8,-61: 0
       -8,-60: 0
-      -8,-59: 4
+      -8,-59: 5
       -7,-64: 0
       -7,-63: 0
       -7,-62: 0
       -7,-61: 0
       -7,-60: 0
-      -7,-59: 4
+      -7,-59: 5
       -7,-54: 0
-      -7,-53: 1
+      -7,-53: 2
       -7,-52: 0
       -6,-64: 0
       -6,-63: 0
@@ -21399,7 +21399,7 @@ entities:
       -24,-60: 0
       -24,-59: 0
       -24,-58: 0
-      -24,-57: 4
+      -24,-57: 5
       -24,-56: 0
       -24,-55: 0
       -24,-54: 0
@@ -22505,6 +22505,17 @@ entities:
       - 0
       - 0
       - 0
+    - volume: 2500
+      temperature: 235
+      moles:
+      - 21.824879
+      - 82.10312
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
     - volume: 2500
       temperature: 293.15
       moles:
@@ -29876,11 +29887,9 @@ entities:
     parent: 100
     type: Transform
 - uid: 1205
-  type: AirlockMaintKitchenLocked
+  type: AtmosFixFreezerMarker
   components:
-  - name: Service Maintenance
-    type: MetaData
-  - pos: -26.5,29.5
+  - pos: -26.5,31.5
     parent: 100
     type: Transform
 - uid: 1206
@@ -37192,25 +37201,25 @@ entities:
     parent: 100
     type: Transform
 - uid: 2212
-  type: WeaponTaser
+  type: WeaponDisabler
   components:
-  - pos: 16.510326,45.837105
+  - pos: 16.60844,45.502533
     parent: 100
     type: Transform
   - canCollide: False
     type: Physics
 - uid: 2213
-  type: WeaponTaser
+  type: WeaponDisabler
   components:
-  - pos: 16.525951,45.712105
+  - pos: 16.405315,45.580658
     parent: 100
     type: Transform
   - canCollide: False
     type: Physics
 - uid: 2214
-  type: WeaponTaser
+  type: WeaponDisabler
   components:
-  - pos: 16.525951,45.587105
+  - pos: 16.38969,45.768158
     parent: 100
     type: Transform
   - canCollide: False
@@ -53987,10 +53996,10 @@ entities:
     parent: 100
     type: Transform
   - ringtone:
+    - D
     - A
-    - E
-    - G
-    - E
+    - C
+    - D
     type: Ringer
   - canCollide: False
     type: Physics
@@ -111896,7 +111905,7 @@ entities:
 - uid: 12135
   type: BoxFlashbang
   components:
-  - pos: 18.35479,48.753414
+  - pos: 14.466008,45.66251
     parent: 100
     type: Transform
   - canCollide: False
@@ -112515,9 +112524,9 @@ entities:
     parent: 100
     type: Transform
 - uid: 12207
-  type: WeaponTaser
+  type: WeaponDisabler
   components:
-  - pos: -39.573,65.700195
+  - pos: -39.488503,65.60927
     parent: 100
     type: Transform
   - canCollide: False
@@ -113083,13 +113092,14 @@ entities:
   - enabled: False
     type: AmbientSound
 - uid: 12272
-  type: VendingMachineSnack
+  type: PottedPlant6
   components:
   - pos: -26.5,-6.5
     parent: 100
     type: Transform
-  - enabled: False
-    type: AmbientSound
+  - containers:
+      stash: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 12273
   type: VendingMachineCola
   components:
@@ -114227,9 +114237,9 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 12434
-  type: WeaponTaser
+  type: WeaponDisabler
   components:
-  - pos: 16.525951,45.47773
+  - pos: 16.624065,45.690033
     parent: 100
     type: Transform
   - canCollide: False
@@ -115711,9 +115721,9 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 12603
-  type: MagazinePistolRubber
+  type: MagazinePistolHighVelocity
   components:
-  - pos: 4.538958,48.754208
+  - pos: 13.696361,50.7519
     parent: 100
     type: Transform
   - unspawnedCount: 10
@@ -126180,7 +126190,7 @@ entities:
 - uid: 14029
   type: Stunbaton
   components:
-  - pos: 18.556257,48.506535
+  - pos: 16.383814,32.558643
     parent: 100
     type: Transform
   - canCollide: False
@@ -126206,7 +126216,7 @@ entities:
 - uid: 14031
   type: Stunbaton
   components:
-  - pos: 18.665632,48.39716
+  - pos: 10.447339,45.158623
     parent: 100
     type: Transform
   - canCollide: False
@@ -128932,7 +128942,7 @@ entities:
 - uid: 14373
   type: MagazinePistol
   components:
-  - pos: 13.660907,50.757244
+  - pos: 13.805736,50.486275
     parent: 100
     type: Transform
   - unspawnedCount: 10
@@ -142936,9 +142946,9 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 16181
-  type: MagazineBoxPistolRubber
+  type: MagazineBoxPistolPractice
   components:
-  - pos: 17.509916,53.587414
+  - pos: 17.460571,53.54589
     parent: 100
     type: Transform
   - unspawnedCount: 60
@@ -143074,9 +143084,9 @@ entities:
     parent: 100
     type: Transform
 - uid: 16199
-  type: MagazinePistolRubber
+  type: MagazinePistol
   components:
-  - pos: 13.816244,50.57179
+  - pos: 4.573118,48.669357
     parent: 100
     type: Transform
   - unspawnedCount: 10
@@ -146076,4 +146086,188 @@ entities:
   - pos: -12.5,22.5
     parent: 100
     type: Transform
+- uid: 16604
+  type: RiotShield
+  components:
+  - pos: 18.799433,48.42335
+    parent: 100
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 16605
+  type: RiotShield
+  components:
+  - pos: 18.690058,48.61085
+    parent: 100
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 16606
+  type: RiotShield
+  components:
+  - pos: 18.502558,48.407726
+    parent: 100
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 16607
+  type: RiotShield
+  components:
+  - pos: 18.299433,48.61085
+    parent: 100
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 16608
+  type: MakeshiftShield
+  components:
+  - pos: 25.2793,23.41335
+    parent: 100
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 16609
+  type: MakeshiftShield
+  components:
+  - pos: 14.468298,-59.518295
+    parent: 100
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 16610
+  type: Paper
+  components:
+  - desc: It's a ripped off page from the popular Bartender's Guide "Drink Mixers", some things are crossed out and circled....
+    name: Page from Drink Mixers
+    type: MetaData
+  - pos: -3.4282973,9.555132
+    parent: 100
+    type: Transform
+  - content: >
+      Brave Bull - Tequila 2, Kahlua 1
+
+      Moonshine - Vodka 1, Tequila 1, Whiskey 1
+
+      ~
+
+      ~
+
+      Manly Dorf - Ale 2, Beer 1
+
+      ~
+
+      Starkist - Cola 1, OJ 2
+
+      Black Russian - Vodka 2, Kahlua 1
+    type: Paper
+  - canCollide: False
+    type: Physics
+- uid: 16611
+  type: DrinkGlass
+  components:
+  - pos: 0.6534242,11.694346
+    parent: 100
+    type: Transform
+  - canCollide: False
+    type: Physics
+  - solution: drink
+    type: DrainableSolution
+- uid: 16612
+  type: DrinkGlass
+  components:
+  - pos: -2.8778257,11.631846
+    parent: 100
+    type: Transform
+  - canCollide: False
+    type: Physics
+  - solution: drink
+    type: DrainableSolution
+- uid: 16613
+  type: DrinkGlass
+  components:
+  - pos: -5.5184507,10.803721
+    parent: 100
+    type: Transform
+  - canCollide: False
+    type: Physics
+  - solution: drink
+    type: DrainableSolution
+- uid: 16614
+  type: DrinkCubaLibreGlass
+  components:
+  - pos: 1.6534243,15.741221
+    parent: 100
+    type: Transform
+  - canCollide: False
+    type: Physics
+  - solution: drink
+    type: DrainableSolution
+- uid: 16615
+  type: DrinkBottleOfNothingFull
+  components:
+  - pos: -29.436726,11.725861
+    parent: 100
+    type: Transform
+  - canCollide: False
+    type: Physics
+  - solution: drink
+    type: DrainableSolution
+- uid: 16616
+  type: AtmosDeviceFanTiny
+  components:
+  - anchored: True
+    pos: -28.5,28.5
+    parent: 100
+    type: Transform
+- uid: 16617
+  type: AtmosDeviceFanTiny
+  components:
+  - anchored: True
+    pos: -26.5,29.5
+    parent: 100
+    type: Transform
+- uid: 16618
+  type: AtmosFixFreezerMarker
+  components:
+  - pos: -27.5,31.5
+    parent: 100
+    type: Transform
+- uid: 16619
+  type: AtmosFixFreezerMarker
+  components:
+  - pos: -28.5,31.5
+    parent: 100
+    type: Transform
+- uid: 16620
+  type: AtmosFixFreezerMarker
+  components:
+  - pos: -28.5,30.5
+    parent: 100
+    type: Transform
+- uid: 16621
+  type: AtmosFixFreezerMarker
+  components:
+  - pos: -27.5,30.5
+    parent: 100
+    type: Transform
+- uid: 16622
+  type: AtmosFixFreezerMarker
+  components:
+  - pos: -27.5,29.5
+    parent: 100
+    type: Transform
+- uid: 16623
+  type: AtmosFixFreezerMarker
+  components:
+  - pos: -28.5,29.5
+    parent: 100
+    type: Transform
+- uid: 16624
+  type: AirlockFreezerKitchenHydroLocked
+  components:
+  - name: Freezer
+    type: MetaData
+  - pos: -26.5,29.5
+    parent: 100
+    type: Transform
 ...