Merge pull request #67 from Corvax-Frontier/Upstream-250424

Upstream 250424

Resources/Changelog/Changelog.yml

@@ -4173,3 +4173,43 @@ Entries:
         information.
   id: 4931
   time: '2024-04-23T21:36:50.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: NFSD Fixed the colors and machines on the NFSD base
+  id: 4932
+  time: '2024-04-24T22:36:54.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added safary suit and hat to AutoDrobe.
+    - type: Add
+      message: Added specific procedural suits to AutoDrobe.
+    - type: Tweak
+      message: >-
+        Arcadia Mask, Hydroponics EVA and Mailcarrier EVA helmets hide
+        character's hair now.
+    - type: Tweak
+      message: Pilot's hardsuit no longer requires mask to use air tank.
+    - type: Fix
+      message: Fixed arcadia webbing not displaying on character.
+  id: 4933
+  time: '2024-04-24T22:39:53.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Add
+      message: Adds the Barnacle black market ship
+  id: 4934
+  time: '2024-04-25T00:20:16.0000000+00:00'
+- author: Tych0theSynth
+  changes:
+    - type: Tweak
+      message: Tweaked the NSF Prowler and gave her a new lick of paint.
+  id: 4935
+  time: '2024-04-25T01:01:42.0000000+00:00'
+- author: Tych0theSynth
+  changes:
+    - type: Tweak
+      message: Updated NSF Inquisitor.
+  id: 4936
+  time: '2024-04-25T02:57:06.0000000+00:00'

Resources/Maps/_NF/POI/cove.yml

@@ -2338,6 +2338,21 @@ entities:
     - type: Transform
       pos: 4.5,3.5
       parent: 1
+  - uid: 1732
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 1
+  - uid: 1738
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 1
+  - uid: 1739
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 1
 - proto: CableMV
   entities:
   - uid: 1316
@@ -3740,19 +3755,21 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-- proto: ComputerFrame
+- proto: ComputerBroken
   entities:
-  - uid: 570
+  - uid: 574
     components:
     - type: Transform
-      pos: 7.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,2.5
       parent: 1
 - proto: ComputerPowerMonitoring
   entities:
-  - uid: 574
+  - uid: 570
     components:
     - type: Transform
-      pos: 7.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,1.5
       parent: 1
 - proto: ComputerShipyardBlackMarket
   entities:
@@ -4938,9 +4955,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-6.5
       parent: 1
-  - uid: 1739
+  - uid: 1832
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 0.5,-5.5
       parent: 1
 - proto: RailingCorner
@@ -4962,55 +4980,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-13.5
       parent: 1
-- proto: RailingCornerSmall
-  entities:
-  - uid: 1732
-    components:
-    - type: Transform
-      pos: 1.5,-7.5
-      parent: 1
-  - uid: 1738
-    components:
-    - type: Transform
-      pos: 1.5,-8.5
-      parent: 1
 - proto: RandomSpawner
   entities:
-  - uid: 1832
-    components:
-    - type: Transform
-      pos: -1.5,0.5
-      parent: 1
-  - uid: 1833
-    components:
-    - type: Transform
-      pos: 0.5,1.5
-      parent: 1
-  - uid: 1834
-    components:
-    - type: Transform
-      pos: -4.5,2.5
-      parent: 1
-  - uid: 1835
-    components:
-    - type: Transform
-      pos: -6.5,3.5
-      parent: 1
-  - uid: 1836
-    components:
-    - type: Transform
-      pos: 3.5,-16.5
-      parent: 1
   - uid: 1837
     components:
     - type: Transform
       pos: -11.5,-13.5
       parent: 1
-  - uid: 1838
-    components:
-    - type: Transform
-      pos: -23.5,-5.5
-      parent: 1
 - proto: ReagentContainerFlour
   entities:
   - uid: 1760
@@ -5182,14 +5158,9 @@ entities:
     - type: Transform
       pos: -7.5,-13.5
       parent: 1
-- proto: SpawnPointLatejoin
+- proto: SpawnPointPirate
   entities:
-  - uid: 1996
-    components:
-    - type: Transform
-      pos: -5.5,-9.5
-      parent: 1
-  - uid: 1997
+  - uid: 1833
     components:
     - type: Transform
       pos: -3.5,-9.5
@@ -11174,39 +11145,39 @@ entities:
       pos: -0.5,-8.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1725.3612
+      secondsUntilStateChange: -1983.0103
       state: Opening
   - uid: 1840
     components:
     - type: Transform
       pos: -0.5,-7.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1726.0421
+      secondsUntilStateChange: -1983.6912
       state: Opening
   - uid: 1841
     components:
     - type: Transform
       pos: -1.5,-1.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1699.2756
+      secondsUntilStateChange: -1956.9247
       state: Opening
   - uid: 1842
     components:
     - type: Transform
       pos: -0.5,-1.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1699.9088
+      secondsUntilStateChange: -1957.5579
       state: Opening
   - uid: 1905
     components:
     - type: Transform
       pos: -5.5,2.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1697.7966
+      secondsUntilStateChange: -1955.4457
       state: Opening
 - proto: WoodSecretDoor
   entities: