diff --git a/Resources/Maps/Shuttles/marauder.yml b/Resources/Maps/Shuttles/marauder.yml
index e4e063c778d..17a70c45e43 100644
--- a/Resources/Maps/Shuttles/marauder.yml
+++ b/Resources/Maps/Shuttles/marauder.yml
@@ -75,124 +75,101 @@ entities:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            37: -3,0
-            38: -3,-1
-            39: -2,-1
+            34: -3,0
+            35: -3,-1
+            36: -2,-1
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNw
           decals:
-            34: -2,-6
+            31: -2,-6
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineN
           decals:
-            35: -1,-6
-            36: 0,-6
+            32: -1,-6
+            33: 0,-6
         - node:
             color: '#E97F004C'
             id: BrickTileWhiteLineE
           decals:
-            48: 1,3
-            49: 1,0
-            50: 1,-1
-            51: 1,2
-        - node:
-            angle: -1.5707963267948966 rad
-            color: '#E97F004C'
-            id: Caution
-          decals:
-            52: 0.7844713,-1.0209713
-            53: 0.7844713,3.0102787
+            46: 1,0
+            48: 1,2
         - node:
             color: '#B4B4B4FF'
             id: CheckerNESW
           decals:
-            20: 1,-4
-            21: 1,-5
-            22: 1,-6
-            23: 2,-6
-            24: 2,-5
-            25: 2,-4
-            26: 3,-4
-            27: 3,-5
-            28: 3,-6
-            29: 4,-6
-            30: 4,-5
-            31: 5,-6
-            32: 3,-3
-            33: 2,-3
+            19: 1,-6
         - node:
             color: '#6FB2FB9B'
             id: CheckerNWSE
           decals:
-            60: -2,5
-            61: -3,5
-            62: -4,5
-            63: -5,5
+            51: -2,5
+            52: -3,5
+            53: -4,5
+            54: -5,5
         - node:
             color: '#B4000049'
             id: CheckerNWSE
           decals:
-            3: -2,12
-            4: -3,12
-            5: -4,12
-            6: -4,11
-            7: -5,11
-            8: -2,11
-            9: -3,11
-            10: -4,10
-            11: -3,10
-            12: -2,10
-            13: -2,9
-            14: -3,9
-            15: -4,9
-            16: -4,8
-            17: -3,8
-            18: -2,8
-            19: -1,11
+            0: -2,12
+            1: -3,12
+            2: -4,12
+            3: -4,11
+            4: -5,11
+            5: -2,11
+            6: -3,11
+            7: -4,10
+            8: -3,10
+            9: -2,10
+            10: -2,9
+            11: -3,9
+            12: -4,9
+            13: -4,8
+            14: -3,8
+            15: -2,8
+            16: -1,11
         - node:
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            42: -12,-18
-            43: 12,-18
+            39: -12,-18
+            40: 12,-18
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            41: 3,-11
+            38: 3,-11
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            40: -3,-11
+            37: -3,-11
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            44: -14,-14
-            45: -14,-16
+            41: -14,-14
+            42: -14,-16
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            46: 14,-16
-            47: 14,-14
+            43: 14,-16
+            44: 14,-14
         - node:
             color: '#FFFFFFFF'
             id: b
           decals:
-            67: -1.8067541,0.85464954
+            55: -1.8067541,0.85464954
       type: DecalGrid
     - version: 2
       data:
         tiles:
           0,0:
-            0: 65021
-            1: 514
+            0: 65535
           0,1:
             0: 65535
           0,2:
@@ -204,19 +181,15 @@ entities:
           1,1:
             0: 65535
           1,2:
-            0: 53111
-            1: 128
-            2: 12288
-            3: 8
+            0: 65535
           1,3:
-            0: 30463
-            1: 256
+            0: 32767
           2,1:
             0: 13072
           2,2:
-            0: 4915
+            0: 13107
           2,3:
-            0: 1
+            0: 17
           2,0:
             0: 2252
           3,0:
@@ -232,8 +205,7 @@ entities:
           1,-2:
             0: 65535
           1,-1:
-            0: 13111
-            4: 72
+            0: 13183
           2,-4:
             0: 65262
           2,-3:
@@ -257,21 +229,19 @@ entities:
           -3,1:
             0: 34816
           -3,2:
-            0: 2184
+            0: 34952
           -2,1:
             0: 65534
           -2,2:
             0: 65535
           -2,3:
-            0: 52463
+            0: 52991
           -2,0:
             0: 51336
           -1,0:
-            0: 65531
-            2: 4
+            0: 65535
           -1,1:
-            0: 64255
-            1: 1280
+            0: 65535
           -1,2:
             0: 65535
           -1,3:
@@ -299,15 +269,13 @@ entities:
           -2,-2:
             0: 61439
           -2,-1:
-            0: 34956
-            4: 66
+            0: 35022
           -1,-3:
             0: 65535
           -1,-2:
             0: 65535
           -1,-1:
-            0: 57343
-            1: 8192
+            0: 65535
           -4,-5:
             0: 60616
           -3,-6:
@@ -323,22 +291,17 @@ entities:
           3,-5:
             0: 63347
           -2,4:
-            0: 8
+            0: 2188
           -1,4:
-            0: 52991
-            4: 8448
+            0: 65535
           -1,5:
-            0: 8
-            4: 132
+            0: 36078
           0,4:
-            0: 32767
-            4: 32768
+            0: 65535
           0,5:
-            0: 19
-            4: 292
+            0: 14335
           1,4:
-            0: 19
-            4: 256
+            0: 4919
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -355,66 +318,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 293.14996
-          moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.14996
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.14993
-          moles:
-          - 18.472576
-          - 69.49208
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         chunkSize: 4
       type: GridAtmosphere
     - type: GasTileOverlay
@@ -4059,6 +3962,12 @@ entities:
       pos: -3.5,10.5
       parent: 1
       type: Transform
+  - uid: 1166
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -3.5,18.5
+      parent: 1
+      type: Transform
   - uid: 1189
     components:
     - rot: -1.5707963267948966 rad
@@ -4071,6 +3980,12 @@ entities:
       pos: -0.5,18.5
       parent: 1
       type: Transform
+  - uid: 1519
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 4.5,18.5
+      parent: 1
+      type: Transform
 - proto: EncryptionKeyCommand
   entities:
   - uid: 537
@@ -8240,87 +8155,189 @@ entities:
   entities:
   - uid: 1150
     components:
-    - rot: 3.141592653589793 rad
-      pos: -12.5,-17.5
+    - rot: 1.5707963267948966 rad
+      pos: -3.5,18.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Port 1
+      type: SurveillanceCamera
   - uid: 1153
     components:
     - rot: -1.5707963267948966 rad
       pos: -6.5,-7.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Hallway [LEFT]
+      type: SurveillanceCamera
   - uid: 1156
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,-0.5
+    - rot: 3.141592653589793 rad
+      pos: 1.5,3.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Cell 1
+      type: SurveillanceCamera
   - uid: 1157
     components:
     - rot: 1.5707963267948966 rad
       pos: -1.5,-0.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Storage
+      type: SurveillanceCamera
   - uid: 1158
     components:
     - rot: 1.5707963267948966 rad
       pos: 7.5,-7.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Hallway [RIGHT]
+      type: SurveillanceCamera
   - uid: 1160
     components:
     - rot: 3.141592653589793 rad
       pos: 6.5,9.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Armory
+      type: SurveillanceCamera
   - uid: 1163
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,2.5
+    - pos: 1.5,-0.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Cell 2
+      type: SurveillanceCamera
   - uid: 1165
     components:
     - rot: 1.5707963267948966 rad
       pos: -8.5,8.5
       parent: 1
       type: Transform
-  - uid: 1166
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 9.5,8.5
-      parent: 1
-      type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Port 2
+      type: SurveillanceCamera
   - uid: 1167
     components:
     - rot: 3.141592653589793 rad
       pos: 12.5,-13.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Docking port [RIGHT]
+      type: SurveillanceCamera
   - uid: 1168
     components:
     - rot: 3.141592653589793 rad
       pos: -11.5,-13.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Docking port [LEFT]
+      type: SurveillanceCamera
   - uid: 1169
     components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,-17.5
+    - rot: -1.5707963267948966 rad
+      pos: 4.5,18.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Starboard 1
+      type: SurveillanceCamera
   - uid: 1171
     components:
     - rot: 1.5707963267948966 rad
-      pos: 4.5,-4.5
+      pos: 5.5,-5.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Kitchen
+      type: SurveillanceCamera
   - uid: 1172
     components:
     - pos: -0.5,-5.5
       parent: 1
       type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Lunch room
+      type: SurveillanceCamera
+  - uid: 1520
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -1.5,9.5
+      parent: 1
+      type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: EVA port room
+      type: SurveillanceCamera
+  - uid: 1521
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -12.5,-17.5
+      parent: 1
+      type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Port 3
+      type: SurveillanceCamera
+  - uid: 1522
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 13.5,-17.5
+      parent: 1
+      type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Starboard 3
+      type: SurveillanceCamera
+  - uid: 1523
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 9.5,8.5
+      parent: 1
+      type: Transform
+    - setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Starboard 2
+      type: SurveillanceCamera
 - proto: Table
   entities:
   - uid: 1174