Ships

new-frontiers-14 · Apr 29, 2024 · 0c63aa9 · 0c63aa9
1 parent 1d7fcb5
commit 0c63aa9
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 388 deletions.
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml
@@ -703,13 +703,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,2.5
       parent: 201
-- proto: CratePirate
-  entities:
-  - uid: 226
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 201
 - proto: DefibrillatorCabinetFilled
   entities:
   - uid: 206

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
@@ -251,7 +251,7 @@ entities:
       pos: 1.5,-0.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -138.06781
+      secondsUntilStateChange: -239.95091
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -642,96 +642,6 @@ entities:
     - type: Transform
       pos: 0.5,9.5
       parent: 2
-- proto: CannonBall
-  entities:
-  - uid: 205
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 206
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 207
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 208
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: CannonBallGlassshot
-  entities:
-  - uid: 201
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 202
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 203
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 204
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: CannonBallGrapeshot
-  entities:
-  - uid: 198
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 199
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 200
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 210
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: Catwalk
   entities:
   - uid: 80
@@ -989,54 +899,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,10.5
       parent: 2
-- proto: CratePirate
-  entities:
-  - uid: 197
-    components:
-    - type: Transform
-      pos: 0.5,0.5
-      parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 209
-          - 208
-          - 207
-          - 206
-          - 205
-          - 204
-          - 203
-          - 202
-          - 201
-          - 200
-          - 199
-          - 198
-          - 210
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: DefibrillatorCabinetFilled
   entities:
   - uid: 149
@@ -1473,15 +1335,6 @@ entities:
     - type: Transform
       pos: 2.5,-2.5
       parent: 2
-- proto: PirateHandyFlag
-  entities:
-  - uid: 209
-    components:
-    - type: Transform
-      parent: 197
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: PlastitaniumWindow
   entities:
   - uid: 144
@@ -1677,19 +1530,26 @@ entities:
         - Pressed: Trigger
         75:
         - Pressed: Trigger
-- proto: SpawnPointLatejoin
+- proto: SpawnPointPirate
   entities:
   - uid: 158
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
+- proto: SpawnPointPirateCaptain
+  entities:
+  - uid: 156
     components:
     - type: Transform
       pos: 0.5,6.5
       parent: 2
-- proto: SpawnPointPirate
+- proto: SpawnPointPirateFirstMate
   entities:
-  - uid: 164
+  - uid: 76
     components:
     - type: Transform
-      pos: 0.5,7.5
+      pos: 0.5,5.5
       parent: 2
 - proto: SubstationBasic
   entities:

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml
@@ -164,20 +164,6 @@ entities:
     - type: BecomesStation
       id: mailhunter
     - type: SpreaderGrid
-- proto: ActionToggleInternals
-  entities:
-  - uid: 53
-    components:
-    - type: Transform
-      parent: 5
-    - type: InstantAction
-      container: 5
-  - uid: 131
-    components:
-    - type: Transform
-      parent: 18
-    - type: InstantAction
-      container: 18
 - proto: AirAlarm
   entities:
   - uid: 125
@@ -238,12 +224,12 @@ entities:
   - uid: 133
     components:
     - type: Transform
-      pos: 1.8442372,1.3896302
+      pos: 0.67193127,0.721212
       parent: 103
   - uid: 134
     components:
     - type: Transform
-      pos: 1.5838206,1.3792136
+      pos: 0.3177646,0.721212
       parent: 103
 - proto: AmeShielding
   entities:
@@ -583,13 +569,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,2.5
       parent: 103
-- proto: CratePirateChest
-  entities:
-  - uid: 135
-    components:
-    - type: Transform
-      pos: 1.5,2.5
-      parent: 103
 - proto: DefibrillatorCabinetFilled
   entities:
   - uid: 117
@@ -739,13 +718,6 @@ entities:
     - type: Transform
       pos: 1.5,4.5
       parent: 103
-- proto: GunSafeShuttleT3Spawner
-  entities:
-  - uid: 34
-    components:
-    - type: Transform
-      pos: -1.5,2.5
-      parent: 103
 - proto: Gyroscope
   entities:
   - uid: 119
@@ -755,35 +727,6 @@ entities:
       parent: 103
     - type: Thruster
       originalPowerLoad: 1500
-- proto: NitrousOxideTankFilled
-  entities:
-  - uid: 5
-    components:
-    - type: Transform
-      pos: -0.48881638,3.010011
-      parent: 103
-    - type: GasTank
-      toggleActionEntity: 53
-    - type: ActionsContainer
-    - type: ContainerContainer
-      containers:
-        actions: !type:Container
-          ents:
-          - 53
-  - uid: 18
-    components:
-    - type: Transform
-      parent: 10
-    - type: GasTank
-      toggleActionEntity: 131
-    - type: Physics
-      canCollide: False
-    - type: ActionsContainer
-    - type: ContainerContainer
-      containers:
-        actions: !type:Container
-          ents:
-          - 131
 - proto: PoweredlightColoredBlack
   entities:
   - uid: 127
@@ -792,6 +735,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,0.5
       parent: 103
+- proto: Rack
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 103
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 75
@@ -1143,21 +1093,4 @@ entities:
     - type: Transform
       pos: -0.5,1.5
       parent: 103
-- proto: WeaponImprovisedPneumaticCannon
-  entities:
-  - uid: 10
-    components:
-    - type: Transform
-      pos: -0.3918358,2.7159653
-      parent: 103
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        gas_tank: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 18
 ...