diff --git a/Content.Server/ADT/GameTicking/Rules/Components/PiratesRuleComponent.cs b/Content.Server/ADT/GameTicking/Rules/Components/PiratesRuleComponent.cs
index c04bc48fab..c41f5ed755 100644
--- a/Content.Server/ADT/GameTicking/Rules/Components/PiratesRuleComponent.cs
+++ b/Content.Server/ADT/GameTicking/Rules/Components/PiratesRuleComponent.cs
@@ -23,5 +23,5 @@ public sealed partial class PiratesRuleComponent : Component
         AudioParams.Default.WithVolume(4));
 
     [DataField]
-    public string PiratesShuttlePath = "Maps/ADTMaps/Shuttles/ERT_base.yml";
+    public string PiratesShuttlePath = "/Maps/ADTMaps/Shuttles/pirate.yml";
 }
diff --git a/Resources/Maps/ADTMaps/Shuttles/pirate.yml b/Resources/Maps/ADTMaps/Shuttles/pirate.yml
index 942d2c9c02..db084bc861 100644
--- a/Resources/Maps/ADTMaps/Shuttles/pirate.yml
+++ b/Resources/Maps/ADTMaps/Shuttles/pirate.yml
@@ -286,7 +286,8 @@ entities:
           0,-3:
             0: 30583
           -1,-3:
-            0: 52701
+            0: 52445
+            2: 256
           0,-2:
             0: 6129
           -1,-2:
@@ -297,7 +298,8 @@ entities:
           1,-4:
             0: 11187
           1,-3:
-            0: 12287
+            0: 12031
+            2: 256
           1,-2:
             0: 24575
           1,-5:
@@ -307,9 +309,11 @@ entities:
             0: 272
             1: 33860
           2,-3:
-            0: 1911
+            0: 1907
+            2: 4
           2,-2:
-            0: 1911
+            0: 887
+            2: 1024
             1: 32768
           2,-1:
             1: 17
@@ -330,7 +334,8 @@ entities:
           -2,-4:
             0: 36590
           -2,-2:
-            0: 59630
+            2: 2
+            0: 59628
           -2,-1:
             0: 238
             1: 57344
@@ -394,6 +399,29 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -404,6 +432,14 @@ entities:
     - type: Transform
       pos: -0.5,-12.5
       parent: 2
+- proto: ADTClothingUnderwearBottomPantiesCap
+  entities:
+  - uid: 420
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.7995796,-4.4446487
+      parent: 2
 - proto: ADTComputerPalletConsolePirate
   entities:
   - uid: 233
@@ -412,39 +448,53 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-12.5
       parent: 2
-- proto: ADTDrinkRumCanister
+- proto: ADTFoodTinCondensedMilk
   entities:
-  - uid: 373
+  - uid: 342
     components:
     - type: Transform
-      pos: 1.8769671,-16.547262
+      pos: -6.566634,-14.640817
       parent: 2
-  - uid: 374
+  - uid: 343
     components:
     - type: Transform
-      pos: 1.3769671,-16.531637
+      pos: -6.191634,-14.843942
       parent: 2
-  - uid: 375
+- proto: ADTSpawnPointLostCaptainPirate
+  entities:
+  - uid: 435
     components:
     - type: Transform
-      pos: 1.8144671,-16.234762
+      pos: 0.5,-0.5
       parent: 2
-  - uid: 376
+- proto: ADTSpawnPointLostFirstmate
+  entities:
+  - uid: 434
     components:
     - type: Transform
-      pos: 1.3457171,-16.203512
+      pos: 1.5,-1.5
       parent: 2
-- proto: ADTFoodTinCondensedMilk
+- proto: ADTSpawnPointPirate
   entities:
-  - uid: 342
+  - uid: 322
     components:
     - type: Transform
-      pos: -6.566634,-14.640817
+      pos: -5.5,-16.5
       parent: 2
-  - uid: 343
+  - uid: 408
     components:
     - type: Transform
-      pos: -6.191634,-14.843942
+      pos: -3.5,-16.5
+      parent: 2
+  - uid: 436
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 2
+  - uid: 437
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
       parent: 2
 - proto: AirlockExternalGlassShuttleSyndicateLocked
   entities:
@@ -552,7 +602,7 @@ entities:
       pos: 5.5,-12.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -84.0904
+      secondsUntilStateChange: -897.94574
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -610,6 +660,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,2.5
       parent: 2
+- proto: BannerRed
+  entities:
+  - uid: 421
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 2
 - proto: Bed
   entities:
   - uid: 307
@@ -1430,222 +1487,118 @@ entities:
       parent: 2
 - proto: CannonBall
   entities:
-  - uid: 406
+  - uid: 375
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.712067,-5.813965
-      parent: 2
-  - uid: 407
+      parent: 374
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 376
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.430817,-5.813965
-      parent: 2
-  - uid: 408
+      parent: 374
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 383
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.149567,-5.813965
-      parent: 2
-  - uid: 409
+      parent: 374
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 384
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.118317,-5.470215
-      parent: 2
+      parent: 374
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 388
+    components:
+    - type: Transform
+      parent: 374
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 406
+    components:
+    - type: Transform
+      parent: 374
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 407
+    components:
+    - type: Transform
+      parent: 374
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 410
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.180817,-5.23584
-      parent: 2
+      parent: 374
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 411
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.415192,-5.251465
-      parent: 2
+      parent: 409
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 412
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.743317,-5.220215
-      parent: 2
+      parent: 409
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 413
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.696442,-5.532715
-      parent: 2
+      parent: 409
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 414
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.368317,-5.532715
-      parent: 2
+      parent: 409
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 415
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.180817,-7.782715
-      parent: 2
+      parent: 409
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 416
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.165192,-7.48584
-      parent: 2
+      parent: 409
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 417
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.165192,-7.220215
-      parent: 2
+      parent: 409
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 418
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.462067,-7.23584
-      parent: 2
-  - uid: 419
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.743317,-7.23584
-      parent: 2
-  - uid: 420
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.758942,-7.48584
-      parent: 2
-  - uid: 421
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.493317,-7.48584
-      parent: 2
-  - uid: 422
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.462067,-7.76709
-      parent: 2
-  - uid: 423
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.665192,-7.782715
-      parent: 2
-  - uid: 424
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.743317,-9.73584
-      parent: 2
-  - uid: 425
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.508942,-9.73584
-      parent: 2
-  - uid: 426
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.165192,-9.70459
-      parent: 2
-  - uid: 427
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.196442,-9.42334
-      parent: 2
-  - uid: 428
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.477692,-9.42334
-      parent: 2
-  - uid: 429
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.743317,-9.42334
-      parent: 2
-  - uid: 430
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.712067,-9.17334
-      parent: 2
-  - uid: 431
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.493317,-9.23584
-      parent: 2
-  - uid: 432
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.212067,-9.20459
-      parent: 2
-  - uid: 433
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.258942,-11.73584
-      parent: 2
-  - uid: 434
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.524567,-11.73584
-      parent: 2
-  - uid: 435
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.758942,-11.73584
-      parent: 2
-  - uid: 436
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.727692,-11.470215
-      parent: 2
-  - uid: 437
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.524567,-11.470215
-      parent: 2
-  - uid: 438
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.212067,-11.470215
-      parent: 2
-  - uid: 439
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.243317,-11.23584
-      parent: 2
-  - uid: 440
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.508942,-11.220215
-      parent: 2
-  - uid: 441
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.727692,-11.220215
-      parent: 2
+      parent: 409
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: CannonBallGrapeshot
   entities:
   - uid: 279
@@ -1956,6 +1909,79 @@ entities:
     - type: Transform
       pos: -7.5,-9.5
       parent: 2
+- proto: ClothingBeltUtilityEngineering
+  entities:
+  - uid: 419
+    components:
+    - type: Transform
+      pos: -3.4962327,-10.443164
+      parent: 2
+  - uid: 780
+    components:
+    - type: Transform
+      parent: 778
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingBeltUtilityFilled
+  entities:
+  - uid: 312
+    components:
+    - type: Transform
+      pos: 1.8631423,-16.548126
+      parent: 2
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 1.3475173,-16.516876
+      parent: 2
+  - uid: 317
+    components:
+    - type: Transform
+      pos: 1.3475173,-16.126251
+      parent: 2
+  - uid: 321
+    components:
+    - type: Transform
+      pos: 1.8631423,-16.141876
+      parent: 2
+- proto: ClothingHeadBandSkull
+  entities:
+  - uid: 427
+    components:
+    - type: Transform
+      parent: 422
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 428
+    components:
+    - type: Transform
+      parent: 422
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 429
+    components:
+    - type: Transform
+      parent: 422
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 430
+    components:
+    - type: Transform
+      parent: 422
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 433
+    components:
+    - type: Transform
+      parent: 422
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ClothingHeadHatPirate
   entities:
   - uid: 313
@@ -1970,13 +1996,6 @@ entities:
     - type: Transform
       pos: 2.280623,-5.1993055
       parent: 2
-- proto: ClothingHeadHatWelding
-  entities:
-  - uid: 322
-    components:
-    - type: Transform
-      pos: -3.5025024,-10.38229
-      parent: 2
 - proto: ClothingHeadHelmetPodWars
   entities:
   - uid: 298
@@ -1989,6 +2008,43 @@ entities:
     - type: Transform
       pos: -1.71875,-12.552576
       parent: 2
+- proto: ClothingMaskBandSkull
+  entities:
+  - uid: 424
+    components:
+    - type: Transform
+      parent: 422
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 425
+    components:
+    - type: Transform
+      parent: 422
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 426
+    components:
+    - type: Transform
+      parent: 422
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 431
+    components:
+    - type: Transform
+      parent: 422
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 432
+    components:
+    - type: Transform
+      parent: 422
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ClothingMaskBreath
   entities:
   - uid: 390
@@ -2006,13 +2062,15 @@ entities:
     - type: Transform
       pos: 4.690876,-10.657715
       parent: 2
-- proto: ClothingNeckCloakPirateCap
+- proto: ClothingMaskWeldingGas
   entities:
-  - uid: 312
+  - uid: 781
     components:
     - type: Transform
-      pos: -3.7056274,-4.5877585
-      parent: 2
+      parent: 778
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ClothingOuterArmorBasic
   entities:
   - uid: 276
@@ -2092,6 +2150,252 @@ entities:
     - type: Transform
       pos: 0.5,0.5
       parent: 2
+- proto: CratePirate
+  entities:
+  - uid: 374
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 375
+          - 410
+          - 376
+          - 383
+          - 384
+          - 388
+          - 406
+          - 407
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+  - uid: 409
+    components:
+    - type: Transform
+      pos: 10.5,-11.5
+      parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 411
+          - 412
+          - 413
+          - 414
+          - 415
+          - 416
+          - 417
+          - 418
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+  - uid: 422
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 423
+          - 424
+          - 425
+          - 426
+          - 427
+          - 428
+          - 429
+          - 430
+          - 431
+          - 432
+          - 433
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+  - uid: 438
+    components:
+    - type: Transform
+      pos: -6.5,-7.5
+      parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 439
+          - 440
+          - 441
+          - 447
+          - 448
+          - 449
+          - 450
+          - 451
+          - 762
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+  - uid: 778
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 779
+          - 780
+          - 781
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: CratePirateChest
   entities:
   - uid: 235
@@ -2179,6 +2483,69 @@ entities:
     - type: Transform
       pos: -4.551009,-17.21894
       parent: 2
+  - uid: 439
+    components:
+    - type: Transform
+      parent: 438
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 440
+    components:
+    - type: Transform
+      parent: 438
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 441
+    components:
+    - type: Transform
+      parent: 438
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 447
+    components:
+    - type: Transform
+      parent: 438
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 448
+    components:
+    - type: Transform
+      parent: 438
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 449
+    components:
+    - type: Transform
+      parent: 438
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 450
+    components:
+    - type: Transform
+      parent: 438
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 451
+    components:
+    - type: Transform
+      parent: 438
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 762
+    components:
+    - type: Transform
+      parent: 438
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: DrinkOatMilkCarton
   entities:
   - uid: 347
@@ -2970,6 +3337,15 @@ entities:
     - type: Transform
       pos: 0.5,-18.5
       parent: 2
+- proto: HeadSkeleton
+  entities:
+  - uid: 423
+    components:
+    - type: Transform
+      parent: 422
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: Lighter
   entities:
   - uid: 352
@@ -3013,6 +3389,13 @@ entities:
     - type: Transform
       pos: 6.8205123,-9.306477
       parent: 2
+  - uid: 779
+    components:
+    - type: Transform
+      parent: 778
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: NitrogenCanister
   entities:
   - uid: 382
@@ -3023,18 +3406,8 @@ entities:
       parent: 2
     - type: Physics
       bodyType: Static
-  - uid: 383
-    components:
-    - type: Transform
-      pos: 8.5,-17.5
-      parent: 2
 - proto: OxygenCanister
   entities:
-  - uid: 316
-    components:
-    - type: Transform
-      pos: -6.5,-6.5
-      parent: 2
   - uid: 318
     components:
     - type: Transform
@@ -3605,38 +3978,6 @@ entities:
     - type: Transform
       pos: -4.6984663,-15.60848
       parent: 2
-  - uid: 762
-    components:
-    - type: Transform
-      pos: -3.5514107,-10.478022
-      parent: 2
-- proto: SpawnPointPirates
-  entities:
-  - uid: 447
-    components:
-    - type: Transform
-      pos: 5.5,-10.5
-      parent: 2
-  - uid: 448
-    components:
-    - type: Transform
-      pos: -5.5,-15.5
-      parent: 2
-  - uid: 449
-    components:
-    - type: Transform
-      pos: -4.5,-10.5
-      parent: 2
-  - uid: 450
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 2
-  - uid: 451
-    components:
-    - type: Transform
-      pos: -4.5,-3.5
-      parent: 2
 - proto: SpeedLoaderMagnum
   entities:
   - uid: 290
@@ -3665,6 +4006,11 @@ entities:
       parent: 2
 - proto: StoolBar
   entities:
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 2
   - uid: 359
     components:
     - type: Transform
@@ -3689,12 +4035,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,-14.5
       parent: 2
-- proto: StorageCanister
-  entities:
-  - uid: 384
+  - uid: 373
     components:
     - type: Transform
-      pos: 8.5,-16.5
+      rot: 3.141592653589793 rad
+      pos: 10.5,-7.5
       parent: 2
 - proto: SubstationBasic
   entities:
@@ -3949,25 +4294,6 @@ entities:
     - type: Transform
       pos: -6.5,-13.5
       parent: 2
-- proto: VendingMachineTankDispenserEVA
-  entities:
-  - uid: 317
-    components:
-    - type: Transform
-      pos: -6.5,-7.5
-      parent: 2
-  - uid: 388
-    components:
-    - type: Transform
-      pos: 4.5,-9.5
-      parent: 2
-- proto: VendingMachineYouTool
-  entities:
-  - uid: 323
-    components:
-    - type: Transform
-      pos: -3.5,-9.5
-      parent: 2
 - proto: WallPlastitanium
   entities:
   - uid: 60
@@ -4803,6 +5129,14 @@ entities:
     - type: Transform
       pos: 4.5,-11.5
       parent: 2
+- proto: WeaponGrapplingGun
+  entities:
+  - uid: 782
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.59737,-7.5000486
+      parent: 2
 - proto: WeaponLaserGun
   entities:
   - uid: 311
@@ -4863,13 +5197,6 @@ entities:
     - type: Transform
       pos: -1.3375802,-8.258998
       parent: 2
-- proto: WelderMini
-  entities:
-  - uid: 321
-    components:
-    - type: Transform
-      pos: -3.2837524,-10.66354
-      parent: 2
 - proto: WeldingFuelTankFull
   entities:
   - uid: 324