From cba524d32f51751a39d47f827544f407c592369a Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Mon, 15 Apr 2024 02:32:33 +0300
Subject: [PATCH 01/13] Update ContrabandSystem.cs

---
 Content.Server/_NF/Contraband/Systems/ContrabandSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/_NF/Contraband/Systems/ContrabandSystem.cs b/Content.Server/_NF/Contraband/Systems/ContrabandSystem.cs
index 798fe1ff659..14a0f890e1f 100644
--- a/Content.Server/_NF/Contraband/Systems/ContrabandSystem.cs
+++ b/Content.Server/_NF/Contraband/Systems/ContrabandSystem.cs
@@ -165,7 +165,7 @@ private bool CanSell(EntityUid uid, TransformComponent xform)
     {
         if (_mobQuery.HasComponent(uid))
         {
-            if (_mobQuery.GetComponent(uid).CurrentState == MobState.Alive)
+            if (_mobQuery.GetComponent(uid).CurrentState == MobState.Dead) // Allow selling alive prisoners
             {
                 return false;
             }

From d58bc819fc60bd76f0136c4046ff27d0ab514958 Mon Sep 17 00:00:00 2001
From: Kesiath <96151729+Kesiath@users.noreply.github.com>
Date: Sun, 28 Apr 2024 13:31:48 -0500
Subject: [PATCH 02/13] initial commit

---
 Content.Server/Shuttles/Components/ShuttleComponent.cs  | 4 ++--
 Content.Server/Shuttles/Components/ThrusterComponent.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Shuttles/Components/ShuttleComponent.cs b/Content.Server/Shuttles/Components/ShuttleComponent.cs
index 488f1d3a21b..568732cd36c 100644
--- a/Content.Server/Shuttles/Components/ShuttleComponent.cs
+++ b/Content.Server/Shuttles/Components/ShuttleComponent.cs
@@ -66,9 +66,9 @@ public sealed partial class ShuttleComponent : Component
         /// Damping applied to the shuttle's physics component when not in FTL.
         /// </summary>
         [DataField("linearDamping"), ViewVariables(VVAccess.ReadWrite)]
-        public float LinearDamping = 0.05f;
+        public float LinearDamping = 0.00f;
 
         [DataField("angularDamping"), ViewVariables(VVAccess.ReadWrite)]
-        public float AngularDamping = 0.05f;
+        public float AngularDamping = 0.6f;
     }
 }
diff --git a/Content.Server/Shuttles/Components/ThrusterComponent.cs b/Content.Server/Shuttles/Components/ThrusterComponent.cs
index 9a08e5fbe5b..6748c1a2145 100644
--- a/Content.Server/Shuttles/Components/ThrusterComponent.cs
+++ b/Content.Server/Shuttles/Components/ThrusterComponent.cs
@@ -66,7 +66,7 @@ public sealed partial class ThrusterComponent : Component
         public string MachinePartThrust = "Capacitor";
 
         [DataField("partRatingThrustMultiplier")]
-        public float PartRatingThrustMultiplier = 1.5f;
+        public float PartRatingThrustMultiplier = 1.15f;
 
         [DataField("thrusterIgnoreEmp")]
         public bool ThrusterIgnoreEmp = false;

From 063a0e5d353f1409ce87bcf4390b0eb2c2568b51 Mon Sep 17 00:00:00 2001
From: Kesiath <96151729+Kesiath@users.noreply.github.com>
Date: Sun, 28 Apr 2024 14:46:24 -0500
Subject: [PATCH 03/13] revert damping change

---
 Content.Server/Shuttles/Components/ShuttleComponent.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Shuttles/Components/ShuttleComponent.cs b/Content.Server/Shuttles/Components/ShuttleComponent.cs
index 568732cd36c..488f1d3a21b 100644
--- a/Content.Server/Shuttles/Components/ShuttleComponent.cs
+++ b/Content.Server/Shuttles/Components/ShuttleComponent.cs
@@ -66,9 +66,9 @@ public sealed partial class ShuttleComponent : Component
         /// Damping applied to the shuttle's physics component when not in FTL.
         /// </summary>
         [DataField("linearDamping"), ViewVariables(VVAccess.ReadWrite)]
-        public float LinearDamping = 0.00f;
+        public float LinearDamping = 0.05f;
 
         [DataField("angularDamping"), ViewVariables(VVAccess.ReadWrite)]
-        public float AngularDamping = 0.6f;
+        public float AngularDamping = 0.05f;
     }
 }

From 60f16edcb7a6ea5467eafb29ff528e495dab58cb Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Mon, 29 Apr 2024 17:02:58 +0300
Subject: [PATCH 04/13] Update ThrusterComponent.cs

---
 Content.Server/Shuttles/Components/ThrusterComponent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Shuttles/Components/ThrusterComponent.cs b/Content.Server/Shuttles/Components/ThrusterComponent.cs
index 6748c1a2145..d60a275f992 100644
--- a/Content.Server/Shuttles/Components/ThrusterComponent.cs
+++ b/Content.Server/Shuttles/Components/ThrusterComponent.cs
@@ -66,7 +66,7 @@ public sealed partial class ThrusterComponent : Component
         public string MachinePartThrust = "Capacitor";
 
         [DataField("partRatingThrustMultiplier")]
-        public float PartRatingThrustMultiplier = 1.15f;
+        public float PartRatingThrustMultiplier = 1.15f; // Frontier - PR #1292 1.5f<1.15f
 
         [DataField("thrusterIgnoreEmp")]
         public bool ThrusterIgnoreEmp = false;

From 717fea9be968bd0907c3f4e42700eac2fa02c0d4 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 29 Apr 2024 17:24:44 +0000
Subject: [PATCH 05/13] Automatic Changelog (#1294)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c1369a85dc9..1f41467e32a 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4367,3 +4367,11 @@ Entries:
       message: NT No longer send mail to pirates.
   id: 4957
   time: '2024-04-29T17:21:42.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: >-
+        The cultist and syndicate migrated to the harder difficulty expeditions
+        only. 
+  id: 4958
+  time: '2024-04-29T17:22:51.0000000+00:00'

From fed7504f5209b8f34844577daa4eef1e0ddd14d4 Mon Sep 17 00:00:00 2001
From: Salvantrix <149609610+Salvantrix@users.noreply.github.com>
Date: Mon, 29 Apr 2024 13:24:56 -0400
Subject: [PATCH 06/13] 04/29/2024 - Armory Removal (Empress) (#1304)

* 04/29/2024 - Armory Removal (Empress)

Removed the filled armory from the Empress.

* Update empress.yml

---------

Co-authored-by: Dvir <dvirf01@gmail.com>
---
 .../Maps/_NF/Shuttles/Security/empress.yml    | 1439 +++--------------
 .../_NF/Shipyard/Security/empress.yml         |    2 +-
 2 files changed, 187 insertions(+), 1254 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/Security/empress.yml b/Resources/Maps/_NF/Shuttles/Security/empress.yml
index 6ecc2ec1c53..399a1cb5204 100644
--- a/Resources/Maps/_NF/Shuttles/Security/empress.yml
+++ b/Resources/Maps/_NF/Shuttles/Security/empress.yml
@@ -1014,214 +1014,225 @@ entities:
       data:
         tiles:
           0,0:
-            0: 65535
-          -2,0:
-            0: 65535
+            0: 62395
+          0,-1:
+            0: 63795
+            1: 8
           -1,0:
-            0: 65535
+            0: 61166
           0,1:
-            0: 65535
+            0: 61167
+          -1,1:
+            0: 65326
           0,2:
-            0: 255
+            0: 14
             1: 3072
+          -1,2:
+            0: 15
+            1: 256
           1,0:
-            0: 65535
+            0: 61695
+          1,-1:
+            0: 64002
+            1: 8
           1,1:
-            0: 65535
+            0: 61102
           1,2:
-            0: 4095
+            0: 2730
           2,0:
-            0: 65535
+            0: 65279
+          2,-1:
+            0: 64264
+            1: 3
           2,1:
-            0: 65535
+            0: 61166
           2,2:
-            0: 511
+            0: 14
             1: 1536
           3,0:
             0: 65535
           3,1:
             0: 65535
           3,2:
-            0: 255
+            0: 15
+          3,-1:
+            0: 65024
+            1: 14
+          4,1:
+            0: 61168
           -4,0:
-            0: 65535
+            0: 65471
+          -4,-1:
+            0: 64002
+            1: 8
+          -5,0:
+            0: 30603
           -4,1:
-            0: 65535
+            0: 48049
+          -5,1:
+            0: 61431
           -4,2:
-            0: 255
+            0: 11
+          -5,2:
+            0: 15
           -3,0:
-            0: 65535
+            0: 65471
           -3,1:
-            0: 65535
+            0: 56793
           -3,2:
-            0: 3839
+            0: 205
             1: 256
-          -2,1:
+          -3,-1:
+            0: 64264
+            1: 3
+          -2,0:
             0: 65535
+          -2,-1:
+            0: 65248
+          -2,1:
+            0: 26212
           -2,2:
-            0: 4095
-          -1,1:
-            0: 65535
-          -1,2:
-            0: 255
-            1: 256
+            0: 102
+          -1,-1:
+            0: 61678
           -8,0:
-            0: 65535
+            0: 3822
+          -8,-1:
+            0: 61164
           -8,1:
-            0: 3142
             1: 32800
             2: 136
+          -7,0:
+            0: 36863
           -8,2:
             1: 8
-          -7,0:
-            0: 65535
           -7,1:
-            0: 4061
             1: 61440
             3: 34
+            0: 136
           -7,2:
-            1: 15
+            1: 1
+            4: 14
+          -7,-1:
+            0: 61917
           -6,0:
-            0: 65535
+            0: 23839
           -6,1:
-            0: 61439
+            0: 3392
             1: 4096
           -6,2:
-            1: 1
-            0: 206
-          -5,0:
-            0: 65535
-          -5,1:
-            0: 65535
-          -5,2:
-            0: 255
+            4: 1
+            0: 8
+          -6,-1:
+            0: 64185
+          -5,-1:
+            0: 63539
+            1: 8
+          4,-1:
+            0: 61678
           4,0:
-            0: 65535
-          4,1:
-            0: 65535
+            0: 61152
           4,2:
-            0: 255
+            0: 14
           5,0:
-            0: 65535
+            0: 48056
           5,1:
-            0: 16383
+            0: 5513
             1: 49152
+          5,-1:
+            0: 65263
           5,2:
-            0: 19
-            1: 12
+            4: 12
           6,0:
-            0: 65535
+            0: 59278
           6,1:
-            0: 4095
             1: 61440
+            0: 238
           6,2:
-            1: 15
+            4: 3
+            1: 12
+          6,-1:
+            0: 61679
           7,0:
-            0: 14199
+            0: 4147
             1: 16384
           7,1:
-            0: 307
-          -4,-1:
-            0: 65527
-            1: 8
-          -3,-1:
-            1: 3
-            0: 65532
-          -2,-1:
-            0: 65535
+            0: 1
+          7,-1:
+            0: 12339
           -1,-4:
-            0: 65535
+            0: 61166
           -1,-3:
-            0: 65535
+            0: 61166
           -1,-2:
-            0: 65535
-          -1,-1:
-            0: 65535
+            0: 61156
           -1,-5:
-            0: 65520
-          0,-5:
-            0: 30576
+            0: 60928
           0,-4:
-            0: 30583
+            0: 13107
           0,-3:
-            0: 30583
+            0: 13107
           0,-2:
-            0: 30583
-          0,-1:
-            0: 65527
-            1: 8
-          1,-1:
-            0: 65527
-            1: 8
-          2,-1:
-            1: 3
-            0: 65532
-          3,-1:
-            0: 65521
-            1: 14
-          -8,-1:
-            0: 65535
+            0: 13104
+          0,-5:
+            0: 13056
           -8,-2:
-            0: 61064
-          -7,-3:
-            1: 13311
-            0: 52224
+            0: 49152
           -7,-2:
-            0: 65535
-          -7,-1:
-            0: 65535
+            0: 56560
+          -7,-3:
+            1: 8955
+            4: 4356
+            0: 16384
           -7,-4:
-            1: 52224
+            1: 35840
+            4: 16384
           -6,-4:
-            1: 61696
+            1: 256
+            4: 61440
           -6,-3:
-            1: 31
-            0: 65504
+            1: 15
+            4: 16
+            0: 56320
           -6,-2:
-            0: 65535
-          -6,-1:
-            0: 65535
+            0: 56797
           -5,-4:
-            1: 28672
+            4: 4096
+            1: 24576
           -5,-3:
-            1: 26215
-            0: 4368
+            1: 8739
+            4: 17476
           -5,-2:
-            0: 30583
-          -5,-1:
-            0: 65527
-            1: 8
+            0: 13104
           4,-4:
-            1: 61440
+            1: 12288
+            4: 49152
           4,-3:
-            1: 13119
-            0: 52416
+            4: 4369
+            1: 8750
+            0: 34816
           4,-2:
-            0: 65535
-          4,-1:
-            0: 65535
+            0: 3808
           5,-4:
-            1: 64512
+            4: 28672
+            1: 35840
           5,-3:
-            1: 207
-            0: 65328
+            1: 143
+            0: 28928
+            4: 64
           5,-2:
-            0: 65535
-          5,-1:
-            0: 65535
+            0: 28276
           6,-4:
-            1: 4352
+            1: 256
+            4: 4096
           6,-3:
-            1: 26231
-            0: 4352
+            4: 17409
+            1: 8822
+            0: 4096
           6,-2:
-            0: 65535
-          6,-1:
-            0: 65535
+            0: 1904
           7,-2:
-            0: 13056
-          7,-1:
-            0: 30583
+            0: 4096
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -1239,7 +1250,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -1283,6 +1294,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -2465,14 +2491,6 @@ entities:
     - type: Transform
       pos: 10.5,9.5
       parent: 1
-- proto: BaseBallBat
-  entities:
-  - uid: 1152
-    components:
-    - type: Transform
-      parent: 1125
-    - type: Physics
-      canCollide: False
 - proto: Bed
   entities:
   - uid: 875
@@ -2741,22 +2759,6 @@ entities:
     - type: Transform
       pos: 25.5,0.5
       parent: 1
-- proto: BoxBeanbag
-  entities:
-  - uid: 1182
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1183
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: BoxBodyBag
   entities:
   - uid: 589
@@ -2790,86 +2792,6 @@ entities:
     - type: Transform
       pos: -0.29593712,-9.424562
       parent: 1
-- proto: BoxLethalshot
-  entities:
-  - uid: 1180
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1181
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: BoxMagazinePistol
-  entities:
-  - uid: 249
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1179
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: BoxMagazinePistolRubber
-  entities:
-  - uid: 251
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1069
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: BoxMagazineRifle
-  entities:
-  - uid: 248
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1067
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: BoxMagazineRifleRubber
-  entities:
-  - uid: 253
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1178
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: BoxTrashbag
   entities:
   - uid: 708
@@ -5609,66 +5531,6 @@ entities:
     - type: Transform
       pos: 18.5,-2.5
       parent: 1
-- proto: CartridgeRocket
-  entities:
-  - uid: 1206
-    components:
-    - type: Transform
-      parent: 497
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1207
-    components:
-    - type: Transform
-      parent: 497
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1208
-    components:
-    - type: Transform
-      parent: 497
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1209
-    components:
-    - type: Transform
-      parent: 497
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: CartridgeRocketEmp
-  entities:
-  - uid: 1196
-    components:
-    - type: Transform
-      parent: 1016
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1197
-    components:
-    - type: Transform
-      parent: 1016
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1198
-    components:
-    - type: Transform
-      parent: 1016
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1199
-    components:
-    - type: Transform
-      parent: 1016
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: Catwalk
   entities:
   - uid: 125
@@ -6475,98 +6337,25 @@ entities:
     - type: Transform
       pos: -1.5,6.5
       parent: 1
+- proto: CrateNfsdSecure1
+  entities:
+  - uid: 251
+    components:
+    - type: Transform
+      pos: 19.5,1.5
+      parent: 1
 - proto: CrateNfsdSecure2
   entities:
-  - uid: 247
+  - uid: 141
     components:
     - type: Transform
-      pos: 19.5,3.5
+      pos: 18.5,1.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.8856695
-        - 7.0937095
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 1179
-          - 1181
-          - 1180
-          - 1067
-          - 1184
-          - 1176
-          - 248
-          - 1188
-          - 249
-          - 1186
-          - 1177
-          - 1187
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-  - uid: 250
+  - uid: 249
     components:
     - type: Transform
-      pos: 21.5,3.5
+      pos: 17.5,1.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.8856695
-        - 7.0937095
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 251
-          - 1190
-          - 146
-          - 253
-          - 1191
-          - 1069
-          - 1185
-          - 1189
-          - 1182
-          - 141
-          - 1183
-          - 1178
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: CrateNfsdSupplies
   entities:
   - uid: 559
@@ -6602,50 +6391,6 @@ entities:
     - type: Transform
       pos: -18.5,-5.5
       parent: 1
-- proto: CrateWeaponSecure
-  entities:
-  - uid: 1016
-    components:
-    - type: Transform
-      pos: 18.5,3.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14926
-        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:
-          - 1195
-          - 1194
-          - 1192
-          - 1193
-          - 1196
-          - 1200
-          - 1198
-          - 1199
-          - 1197
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: CrayonBox
   entities:
   - uid: 988
@@ -7302,36 +7047,6 @@ entities:
     - type: Transform
       pos: 3.438164,6.5435786
       parent: 1
-- proto: EmpGrenade
-  entities:
-  - uid: 1192
-    components:
-    - type: Transform
-      parent: 1016
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1193
-    components:
-    - type: Transform
-      parent: 1016
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1194
-    components:
-    - type: Transform
-      parent: 1016
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1195
-    components:
-    - type: Transform
-      parent: 1016
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: EmpressMothershipComputer
   entities:
   - uid: 617
@@ -7349,36 +7064,6 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-- proto: ExGrenade
-  entities:
-  - uid: 1201
-    components:
-    - type: Transform
-      parent: 497
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1202
-    components:
-    - type: Transform
-      parent: 497
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1203
-    components:
-    - type: Transform
-      parent: 497
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1204
-    components:
-    - type: Transform
-      parent: 497
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: FaxMachineShip
   entities:
   - uid: 1103
@@ -11409,10 +11094,10 @@ entities:
       parent: 1
 - proto: GunSafe
   entities:
-  - uid: 497
+  - uid: 146
     components:
     - type: Transform
-      pos: 17.5,3.5
+      pos: 19.5,3.5
       parent: 1
     - type: EntityStorage
       air:
@@ -11432,25 +11117,16 @@ entities:
         - 0
         - 0
         - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 1203
-          - 1204
-          - 1202
-          - 1205
-          - 1209
-          - 1201
-          - 1207
-          - 1208
-          - 1206
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
+  - uid: 247
+    components:
+    - type: Transform
+      pos: 17.5,3.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: 18.5,3.5
+      parent: 1
 - proto: GyroscopeNfsd
   entities:
   - uid: 660
@@ -11808,60 +11484,6 @@ entities:
     - type: Transform
       pos: 29.692461,1.1016078
       parent: 1
-- proto: MagazineBoxMagnum
-  entities:
-  - uid: 1184
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: MagazineBoxMagnumRubber
-  entities:
-  - uid: 1185
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: MagazineBoxPistol
-  entities:
-  - uid: 1177
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: MagazineBoxPistolRubber
-  entities:
-  - uid: 146
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: MagazineBoxRifleBig
-  entities:
-  - uid: 1176
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: MagazineBoxRifleBigRubber
-  entities:
-  - uid: 141
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: MedicalBed
   entities:
   - uid: 481
@@ -13637,20 +13259,6 @@ entities:
     - type: Transform
       pos: 1.6063663,-8.880302
       parent: 1
-- proto: SecBreachingHammer
-  entities:
-  - uid: 1148
-    components:
-    - type: Transform
-      parent: 1125
-    - type: Physics
-      canCollide: False
-  - uid: 1149
-    components:
-    - type: Transform
-      parent: 1125
-    - type: Physics
-      canCollide: False
 - proto: ShipyardRCD
   entities:
   - uid: 2576
@@ -14550,52 +14158,6 @@ entities:
     - type: Transform
       pos: 27.5,0.5
       parent: 1
-- proto: SpeedLoaderMagnum
-  entities:
-  - uid: 1186
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1187
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1188
-    components:
-    - type: Transform
-      parent: 247
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: SpeedLoaderMagnumRubber
-  entities:
-  - uid: 1189
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1190
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1191
-    components:
-    - type: Transform
-      parent: 250
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: StationMap
   entities:
   - uid: 1736
@@ -15793,20 +15355,6 @@ entities:
     - type: Transform
       pos: 29.509594,0.66229606
       parent: 1
-- proto: Truncheon
-  entities:
-  - uid: 1150
-    components:
-    - type: Transform
-      parent: 1125
-    - type: Physics
-      canCollide: False
-  - uid: 1151
-    components:
-    - type: Transform
-      parent: 1125
-    - type: Physics
-      canCollide: False
 - proto: VendingMachineBooze
   entities:
   - uid: 529
@@ -17701,96 +17249,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,4.5
       parent: 1
-- proto: WeaponDisabler
-  entities:
-  - uid: 1161
-    components:
-    - type: Transform
-      parent: 1124
-    - type: Physics
-      canCollide: False
-  - uid: 1162
-    components:
-    - type: Transform
-      parent: 1124
-    - type: Physics
-      canCollide: False
-  - uid: 1163
-    components:
-    - type: Transform
-      parent: 1124
-    - type: Physics
-      canCollide: False
-  - uid: 1164
-    components:
-    - type: Transform
-      parent: 1124
-    - type: Physics
-      canCollide: False
-- proto: WeaponEmpEmitter
-  entities:
-  - uid: 490
-    components:
-    - type: Transform
-      parent: 323
-    - type: Physics
-      canCollide: False
-  - uid: 581
-    components:
-    - type: Transform
-      parent: 323
-    - type: Physics
-      canCollide: False
-  - uid: 601
-    components:
-    - type: Transform
-      parent: 323
-    - type: Physics
-      canCollide: False
-  - uid: 689
-    components:
-    - type: Transform
-      parent: 323
-    - type: Physics
-      canCollide: False
-  - uid: 697
-    components:
-    - type: Transform
-      parent: 323
-    - type: Physics
-      canCollide: False
-- proto: WeaponEnergyGun
-  entities:
-  - uid: 1170
-    components:
-    - type: Transform
-      parent: 1123
-    - type: Physics
-      canCollide: False
-  - uid: 1171
-    components:
-    - type: Transform
-      parent: 1123
-    - type: Physics
-      canCollide: False
-  - uid: 1172
-    components:
-    - type: Transform
-      parent: 1123
-    - type: Physics
-      canCollide: False
-  - uid: 1173
-    components:
-    - type: Transform
-      parent: 1123
-    - type: Physics
-      canCollide: False
-  - uid: 1174
-    components:
-    - type: Transform
-      parent: 1123
-    - type: Physics
-      canCollide: False
 - proto: WeaponGrapplingGun
   entities:
   - uid: 1228
@@ -17808,558 +17266,33 @@ entities:
     - type: Transform
       pos: -2.485515,-4.420809
       parent: 1
-- proto: WeaponLaserCarbine
+- proto: WeaponRackBase
   entities:
-  - uid: 1143
-    components:
-    - type: Transform
-      parent: 1131
-    - type: Physics
-      canCollide: False
-  - uid: 1144
-    components:
-    - type: Transform
-      parent: 1131
-    - type: Physics
-      canCollide: False
-  - uid: 1145
-    components:
-    - type: Transform
-      parent: 1131
-    - type: Physics
-      canCollide: False
-  - uid: 1146
-    components:
-    - type: Transform
-      parent: 1131
-    - type: Physics
-      canCollide: False
-  - uid: 1147
-    components:
-    - type: Transform
-      parent: 1131
-    - type: Physics
-      canCollide: False
-- proto: WeaponLauncherRocket
-  entities:
-  - uid: 1205
-    components:
-    - type: Transform
-      parent: 497
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: WeaponLauncherRocketEmp
-  entities:
-  - uid: 1200
-    components:
-    - type: Transform
-      parent: 1016
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: WeaponPistolMk58
-  entities:
-  - uid: 1157
-    components:
-    - type: Transform
-      parent: 1018
-    - type: Physics
-      canCollide: False
-  - uid: 1158
-    components:
-    - type: Transform
-      parent: 1018
-    - type: Physics
-      canCollide: False
-  - uid: 1159
-    components:
-    - type: Transform
-      parent: 1018
-    - type: Physics
-      canCollide: False
-  - uid: 1160
-    components:
-    - type: Transform
-      parent: 1018
-    - type: Physics
-      canCollide: False
-- proto: WeaponRackBase
-  entities:
-  - uid: 1126
-    components:
-    - type: Transform
-      pos: 19.5,1.5
-      parent: 1
-    - type: Lock
-      locked: True
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        weapon1_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1099
-        weapon2_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1100
-        weapon3_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1101
-        weapon4_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1102
-        weapon5_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1113
-        weapon6_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-  - uid: 1127
-    components:
-    - type: Transform
-      pos: 18.5,1.5
-      parent: 1
-    - type: Lock
-      locked: True
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        weapon1_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1138
-        weapon2_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1139
-        weapon3_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1140
-        weapon4_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1141
-        weapon5_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1142
-        weapon6_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-  - uid: 1131
+  - uid: 250
     components:
     - type: Transform
-      pos: 17.5,1.5
+      pos: 21.5,3.5
       parent: 1
     - type: Lock
       locked: True
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        weapon1_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1143
-        weapon2_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1144
-        weapon3_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1145
-        weapon4_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1146
-        weapon5_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1147
-        weapon6_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: WeaponRackMeleeBase
+- proto: WeaponRackMeleeWallmountedBase
   entities:
-  - uid: 1125
+  - uid: 323
     components:
     - type: Transform
       pos: 20.5,1.5
       parent: 1
     - type: Lock
       locked: True
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        weapon1_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1148
-        weapon2_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1149
-        weapon3_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1150
-        weapon4_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1151
-        weapon5_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1152
-        weapon6_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: WeaponRackPistolWallmountedBase
   entities:
-  - uid: 1010
-    components:
-    - type: Transform
-      pos: 22.5,2.5
-      parent: 1
-    - type: Lock
-      locked: True
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        weapon1_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1153
-        weapon2_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1154
-        weapon3_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1155
-        weapon4_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1156
-        weapon5_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        weapon6_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-  - uid: 1018
-    components:
-    - type: Transform
-      pos: 22.5,3.5
-      parent: 1
-    - type: Lock
-      locked: True
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        weapon1_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1157
-        weapon2_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1158
-        weapon3_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1159
-        weapon4_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1160
-        weapon5_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        weapon6_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-  - uid: 1124
-    components:
-    - type: Transform
-      pos: 22.5,1.5
-      parent: 1
-    - type: Lock
-      locked: True
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        weapon1_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1161
-        weapon2_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1162
-        weapon3_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1163
-        weapon4_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1164
-        weapon5_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        weapon6_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: WeaponRackPistolWallmountedSecurity
-  entities:
-  - uid: 1013
+  - uid: 253
     components:
     - type: Transform
       pos: 28.5,5.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        weapon1_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1165
-        weapon2_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        weapon3_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        weapon4_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        weapon5_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        weapon6_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: WeaponRackWallmountedBase
-  entities:
-  - uid: 323
-    components:
-    - type: Transform
-      pos: 21.5,4.5
-      parent: 1
-    - type: Lock
-      locked: True
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        weapon1_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 490
-        weapon2_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 581
-        weapon3_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 601
-        weapon4_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 689
-        weapon5_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 697
-        weapon6_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-  - uid: 1123
-    components:
-    - type: Transform
-      pos: 19.5,4.5
-      parent: 1
     - type: Lock
       locked: True
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        weapon1_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1170
-        weapon2_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1171
-        weapon3_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1172
-        weapon4_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1173
-        weapon5_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 1174
-        weapon6_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: WeaponRevolverInspector
-  entities:
-  - uid: 1153
-    components:
-    - type: Transform
-      parent: 1010
-    - type: Physics
-      canCollide: False
-  - uid: 1154
-    components:
-    - type: Transform
-      parent: 1010
-    - type: Physics
-      canCollide: False
-  - uid: 1155
-    components:
-    - type: Transform
-      parent: 1010
-    - type: Physics
-      canCollide: False
-  - uid: 1156
-    components:
-    - type: Transform
-      parent: 1010
-    - type: Physics
-      canCollide: False
-- proto: WeaponRevolverMateba
-  entities:
-  - uid: 1165
-    components:
-    - type: Transform
-      parent: 1013
-    - type: Physics
-      canCollide: False
-- proto: WeaponRifleLecter
-  entities:
-  - uid: 1099
-    components:
-    - type: Transform
-      parent: 1126
-    - type: Physics
-      canCollide: False
-  - uid: 1100
-    components:
-    - type: Transform
-      parent: 1126
-    - type: Physics
-      canCollide: False
-  - uid: 1101
-    components:
-    - type: Transform
-      parent: 1126
-    - type: Physics
-      canCollide: False
-  - uid: 1102
-    components:
-    - type: Transform
-      parent: 1126
-    - type: Physics
-      canCollide: False
-  - uid: 1113
-    components:
-    - type: Transform
-      parent: 1126
-    - type: Physics
-      canCollide: False
-- proto: WeaponShotgunEnforcer
-  entities:
-  - uid: 1138
-    components:
-    - type: Transform
-      parent: 1127
-    - type: Physics
-      canCollide: False
-  - uid: 1139
-    components:
-    - type: Transform
-      parent: 1127
-    - type: Physics
-      canCollide: False
-  - uid: 1140
-    components:
-    - type: Transform
-      parent: 1127
-    - type: Physics
-      canCollide: False
-  - uid: 1141
-    components:
-    - type: Transform
-      parent: 1127
-    - type: Physics
-      canCollide: False
-  - uid: 1142
-    components:
-    - type: Transform
-      parent: 1127
-    - type: Physics
-      canCollide: False
 - proto: WeldingFuelTankHighCapacity
   entities:
   - uid: 823
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml b/Resources/Prototypes/_NF/Shipyard/Security/empress.yml
index d4f2987fa1c..23ea5ea0eda 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Security/empress.yml
@@ -2,7 +2,7 @@
   id: Empress
   name: NSF Empress
   description: A large patrol vessel capable of carrying up to 3 smaller faster attack ships. the flagship vessel of security.
-  price: 203300 #Appraisal value is 173000
+  price: 170000 #Appraisal value is 150000
   category: Large
   group: Security
   shuttlePath: /Maps/_NF/Shuttles/Security/empress.yml

From c572e85ebf1b0ee6bfa07ef15c02571839f1ac5c Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Mon, 29 Apr 2024 20:26:42 +0300
Subject: [PATCH 07/13] Pirate and Syndicate hoverbikes (#1293)

* Pirate and Syndiecate Hoverbikes

* tweak

* Update vehicles.yml

* contra component for hoverbikes, syndie flatpack in contravend
---
 .../Inventories/contravend.yml                |   1 +
 .../Entities/Objects/Devices/flatpacks.yml    |  11 ++
 .../Entities/Objects/Vehicles/vehicles.yml    | 164 +++++++++++++++++-
 .../Objects/Vehicles/hoverbike.rsi/meta.json  |  50 ++++++
 .../Objects/Vehicles/hoverbike.rsi/pirate.png | Bin 0 -> 1564 bytes
 .../Vehicles/hoverbike.rsi/piratemusket.png   | Bin 0 -> 981 bytes
 .../Vehicles/hoverbike.rsi/syndicatebags.png  | Bin 0 -> 1254 bytes
 .../Vehicles/hoverbike.rsi/syndicategun.png   | Bin 0 -> 874 bytes
 .../hoverbike.rsi/syndicatelights.png         | Bin 0 -> 1054 bytes
 9 files changed, 225 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/pirate.png
 create mode 100644 Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/piratemusket.png
 create mode 100644 Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatebags.png
 create mode 100644 Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicategun.png
 create mode 100644 Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatelights.png

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml
index c9c74e6c0a8..3f4eedbf778 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml
@@ -21,3 +21,4 @@
     ClothingBackpackDuffelSyndicateEVABundle: 12
     BoxHoloparasite: 2
     VestineChemistryVial: 2
+    HoverbikeSyndicateFlatpack: 3
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
index 464a1404327..c863edaf1eb 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
@@ -631,3 +631,14 @@
     entity: VehicleHoverbikeNfsdKey
   - type: StaticPrice
     price: 750
+
+- type: entity
+  parent: HoverbikeFlatpack
+  id: HoverbikeSyndicateFlatpack
+  name: syndicate hoverbike flatpack
+  description: A flatpack used for constructing a hoverbike. Keys already slotted in the ignition.
+  components:
+  - type: Flatpack
+    entity: VehicleHoverbikeSyndicateKey
+  - type: StaticPrice
+    price: 750
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml
index be0f216aede..fdda560c9e7 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml
@@ -355,4 +355,166 @@
         whitelist:
           components:
             - Stunbaton
-        priority: 2
\ No newline at end of file
+        priority: 2
+
+# Pirate
+- type: entity
+  parent: VehicleHoverbikeMailcarrier
+  id: VehicleHoverbikePirate
+  name: pirate hoverbike
+  description: Yarr! Dis be me sovereign space shuttle. Now, whaur me rum?
+  components:
+  - type: Storage
+    grid:
+    - 0,0,5,3
+    maxItemSize: Huge
+  - type: Sprite
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+    layers:
+    - state: hull
+      color: "#3d2712"
+    - state: engine
+      map: ["enum.VehicleVisualLayers.AutoAnimate"]
+    - state: pirate
+    - state: lights
+      shader: unshaded
+    noRot: true
+  - type: ItemSlots
+    slots:
+      key_slot:
+        name: vehicle-slot-component-slot-name-keys
+        whitelist:
+          requireAll: true
+          tags:
+          - VehicleKey
+          - HoverbikeKeys
+        priority: 1
+        insertSound:
+          path: /Audio/Effects/Vehicle/vehiclestartup.ogg
+          params:
+            volume: -5
+      piratemusket:
+        name: gun
+        whitelist:
+          components:
+            - Gun
+        priority: 2
+  - type: ItemMapper
+    mapLayers:
+      piratemusket:
+        whitelist:
+          components:
+            - Gun
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+  - type: Appearance
+  - type: Contraband
+
+- type: entity
+  parent: VehicleHoverbikePirate
+  id: VehicleHoverbikePirateKey
+  suffix: With key
+  components:
+  - type: ItemSlots
+    slots:
+      key_slot:
+        name: vehicle-slot-component-slot-name-keys
+        whitelist:
+          requireAll: true
+          tags:
+          - VehicleKey
+          - HoverbikeKeys
+        startingItem: VehicleKeyHoverbikeNF
+        priority: 1
+        insertSound:
+          path: /Audio/Effects/Vehicle/vehiclestartup.ogg
+          params:
+            volume: -5
+      piratemusket:
+        name: gun
+        whitelist:
+          components:
+            - Gun
+        priority: 2
+
+# Syndicate
+- type: entity
+  parent: VehicleHoverbikeMailcarrier
+  id: VehicleHoverbikeSyndicate
+  name: syndicate hoverbike
+  description: This thing screams style. And war crimes.
+  components:
+  - type: Storage
+    grid:
+    - 0,0,8,4
+  - type: Sprite
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+    layers:
+    - state: hull
+      color: "#b51e0e"
+    - state: engine
+      map: ["enum.VehicleVisualLayers.AutoAnimate"]
+    - state: syndicatebags
+    - state: syndicatelights
+      shader: unshaded
+    noRot: true
+  - type: ItemSlots
+    slots:
+      key_slot:
+        name: vehicle-slot-component-slot-name-keys
+        whitelist:
+          requireAll: true
+          tags:
+          - VehicleKey
+          - HoverbikeKeys
+        priority: 1
+        insertSound:
+          path: /Audio/Effects/Vehicle/vehiclestartup.ogg
+          params:
+            volume: -5
+      syndicategun:
+        name: gun
+        whitelist:
+          components:
+            - Gun
+        priority: 2
+  - type: ItemMapper
+    mapLayers:
+      syndicategun:
+        whitelist:
+          components:
+            - Gun
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+  - type: Appearance
+  - type: PointLight
+    enabled: false
+    color: green
+    radius: 6
+    energy: 3
+  - type: Contraband
+
+- type: entity
+  parent: VehicleHoverbikeSyndicate
+  id: VehicleHoverbikeSyndicateKey
+  suffix: With key
+  components:
+  - type: ItemSlots
+    slots:
+      key_slot:
+        name: vehicle-slot-component-slot-name-keys
+        whitelist:
+          requireAll: true
+          tags:
+          - VehicleKey
+          - HoverbikeKeys
+        startingItem: VehicleKeyHoverbikeNF
+        priority: 1
+        insertSound:
+          path: /Audio/Effects/Vehicle/vehiclestartup.ogg
+          params:
+            volume: -5
+      syndicategun:
+        name: gun
+        whitelist:
+          components:
+            - Gun
+        priority: 2
diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json
index 93c306e5887..57a68c7d20c 100644
--- a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json
@@ -81,6 +81,56 @@
         [ 0.2, 0.2, 0.2, 0.2 ]
       ]
     },
+    {
+      "name": "pirate",
+      "directions": 4,
+      "delays": [
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ]
+      ]
+    },
+    {
+      "name": "piratemusket",
+      "directions": 4,
+      "delays": [
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ]
+      ]
+    },
+    {
+      "name": "syndicatebags",
+      "directions": 4,
+      "delays": [
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ]
+      ]
+    },
+    {
+      "name": "syndicatelights",
+      "directions": 4,
+      "delays": [
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ]
+      ]
+    },
+    {
+      "name": "syndicategun",
+      "directions": 4,
+      "delays": [
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ],
+        [ 0.2, 0.2, 0.2, 0.2 ]
+      ]
+    },
     {
       "name": "lights",
       "directions": 4,
diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/pirate.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/pirate.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3d5554b3315f6abd9e0892e3d7c58b7ca9ce8ef
GIT binary patch
literal 1564
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
M_wdD4xsfye0l7s0x&QzG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/piratemusket.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/piratemusket.png
new file mode 100644
index 0000000000000000000000000000000000000000..84d6821ec8f8bb70a7838f6665b2511597e38b4e
GIT binary patch
literal 981
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU~I{Bb`J1#c2+1T%1_J8No8Qr
zm{>c}+T*Z;%(4A;OO&Sal?l8Q*kBbY5O3in+MTd)i)d7-!OkzNzEYD!#N7{WeefW8
z<Esac)~s$`t-xXDFh_QdNbHg$|5aPX4CQ3LKi>V@?%h7-J!iFodH!20Sg~xL-;vgs
zx=@Zihx$33W*pmaf=72|<e5XIHFpmmzP?-He3AY4=P#ynvoYH+eU!OeGP$C;BJJ`O
zi}%9qk&#n6&vza#*`@GN`MPTReT(Ti-#(q$FwghAaC>KKkhpj3nNz!*Y+PlgicbBs
z*RnnJT=bl&S#!6(KN&BfvqD>P-Q^yIMpc!GO$?l+ApxzO5^J?I*)DC7FaOAY^Pk90
zm7>rCCpI=niF9m}|HEHbo-LxTK4(dS%!|s6Yx)HhHgIo|n)bCeCvvUuf$uyqD`o4~
za-ON1bnivRMP-F8yfHE5CYk&@?l7{=HwhHaJ?VZqT8HU<`WN5Iga=|TqKm7t-#`As
zcp@nLwE2O9iUv`O-jq%+|6ca}+xwYi_4ZGf7G2dV{SXF>7PcgBcNd0k5L{6|#S|#Q
zS>O>_%)r1c48n{Iv*t(u1=&kHeO=jKu*e9?>QA`(bQLfrFL}B+hE&{od)F}gN`l0J
zkLpV&bBNyhs?e-3ca`^aX_;NAp<O=|W2`FW7x?{ETJ$=Xk1w|6P^lJcd&{FVNAc?x
zbA4ZO`ktJ<<jZ&I{^t6374LngJ>Sa#v<w?~aBo(gYwgF6zH96E|H_VyJ#hML$LXUV
z6SxEZ=lwk=cHsKy#Bznd6YsEnk<XJyF~CDV`s<@NH@_+#KK%LWdvDkM`~Uq~_2b`a
z&m6n?ac5`O?^`ileB$%U*lDTLJ{^Aj{rdm+KN-#*W}CM8`AYje|0;f&KdFq{U;Vpk
z!_VTsCV!*n3v7z1bbrs!_EYG~<uB3lg2ADoBCduv^d0x#u3P>4WQq2x-n&ZQ%C;#h
zJ$i6BaQ%1XzwdspEo%S@*458;4-GXuQnuoL?f$DwGtNJcEY|Moh}-TAQZk>huiow3
zk0-${E;W|6-FxT0eet=$<!|2aax3)@A8a<g-~aE(W%d4~|3~}p$+vuIfBS#)4BuBr
zbAn#mpRt4c*g(!xJ^IYg{{8#!rEaj?w`Wdqf5+;`@5km;bNzbzJ3BVcA#z&eyyvAy
pzW(2we{R?ECH6Ux;A)uoliOp-uKds8&7cTp@O1TaS?83{1OW6*!%+YL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatebags.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatebags.png
new file mode 100644
index 0000000000000000000000000000000000000000..df6927f0b451585030621d53a262b0b9a1daa28d
GIT binary patch
literal 1254
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU~I{Bb`J1#c2+1T%1_J8No8Qr
zm{>c}+T*Z;%(4A;OO&Sal?l8Q*kBbY5O3in+MTd)i)d7-!OkzNzEYD!#N7{WeefW8
z<Esac)~s$`t-xXDFh_QdNbHg$|5aPX4CQ3LKi>V@?%h7-J!iFodH!20Sg~xL-;vgs
zx=@Zihx$33W*pmaf=72|<e5XIHFpmmzP?-He3AY4=P#ynvoYH+eU!OeGP$C;BJJ`O
zi}%9qk&#n6&vza#*`@GN`MPTReT(Ti-#(q$FwghAaC>KKkhpj3nNz!*Y+PlgicbBs
z*RnnJT=bl&S#!6(KN&BfvqD>P-Q^yIMpc!GO$?l+ApxzO5^J?I*)DC7FaOAY^Pk90
zm7>rCCpI=niF9m}|HEHbo-LxTK4(dS%!|s6Yx)HhHgIo|n)bCeCvvUuf$uyqD`o4~
za-ON1bnivRMP-F8yfHE5CYk&@?l7{=HwhHaJ?VZqT8HU<`WN5Iga=|TqKm7t-#`As
zcp@nLwE2O9iUv`O-jq%+|6ca}+xwYi_4ZGf7G2dV{SXF>7PcgBcNd0k5L{6|#S|#Q
zS>O>_%)r1c48n{Iv*t(u1=&kHeO=jKu*e9TsG1*gH)LR7dhF@q7*cWT?cM!;w;f~-
ze7vuksu0Ac=RD&NgIkD4En~+N&3lo*na*ek^IsHy;cTL<?45ctD<n)s%}AilLtShK
z--!wKYF}sG*?Hl8I@9r!-{(kZOV&BE0Bs`(94t<yK5x$pe_L+VZ*FeBY4`5mdu;#L
z)>Pll@Kd{XJxPAo-D7pjKW|ueKgUn4|BG$s;~VodLw_*M*GzqEvCZy$*e}y>Kt_1-
zM$btiZj)3th9`gA#_{XxH&x%@>Qz&0YoGF*$@ji|<x;)<Uw=L8|8hJ>B$SKl_7&Ye
zzgRhQYgF9*4Hxd$><=tEUbkQW*o<)HwPD^phL_%d-z#HNYybC>`hkZZ3$#yfT5i0d
z!O(4!&g8?7A5QC6fAFDVN9?BkzW0^aZY{m(_doe7Bf3}r_gnPs^*?i|K003X?#hhg
zr%!u7l`7xM|M$b+R@p7rzCC&8=i;*O-=<H0Kc7B(zpO09YVIm6_TaLQUk-l{U)Fs2
z;Db!YPmh153kvSsQLvBYY2w<gy1OfWCH~evyfEHPSy0eYQce4IOy=6Prw?A{zaMYO
z_|7#Y-$W?6M<N+WPx{@J@3idl%A&nF7uRoGzjfQ*xbx@grCnz&+jjl+O@YhHf!2gx
zRN~{~6Wf*=`Rotd6J39%zXi2lZz)aFS5>s%e`)=8esn+mka#sOzkksQx4<Jc``xo*
z_nfNv{pWA@w&}HJG`ik={aTv)cUQlCNc_}Ff$Obj&hPBjIk#)~nVrw;|E^O%wCq=@
ze0|5iTmR+aQuo=K+uz=2@cNy>^LhI}ye+$ZE^YGzkY1PlAGaH?^omI-TxL7Jw0v%H
z{`TA3PId2JS$Fri{G$EeSXLO_pLhGnoZmTS!J%<~e80Z7`?u@&RKw^0>wcYjt~BHG
s|L?y~eFu6WQ_<f2^7Cp?fyJQno7w8bk6ZB$Ejl2sr>mdKI;Vst03u{Sa{vGU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicategun.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicategun.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8148cbc0b963f7c243fe5c67cf891da615bccfd
GIT binary patch
literal 874
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU~I{Bb`J1#c2+1T%1_J8No8Qr
zm{>c}+T*Z;%(4A;OO&Sal?l8Q*kBbY5O3in+MTd)i)d7-!OkzNzEYD!#N7{WeefW8
z<Esac)~s$`t-xXDFh_QdNbHg$|5aPX4CQ3LKi>V@?%h7-J!iFodH!20Sg~xL-;vgs
zx=@Zihx$33W*pmaf=72|<e5XIHFpmmzP?-He3AY4=P#ynvoYH+eU!OeGP$C;BJJ`O
zi}%9qk&#n6&vza#*`@GN`MPTReT(Ti-#(q$FwghAaC>KKkhpj3nNz!*Y+PlgicbBs
z*RnnJT=bl&S#!6(KN&BfvqD>P-Q^yIMpc!GO$?l+ApxzO5^J?I*)DC7FaOAY^Pk90
zm7>rCCpI=niF9m}|HEHbo-LxTK4(dS%!|s6Yx)HhHgIo|n)bCeCvvUuf$uyqD`o4~
za-ON1bnivRMP-F8yfHE5CYk&@?l7{=HwhHaJ?VZqT8HU<`WN5Iga=|TqKm7t-#`As
zcp@nLwE2O9iUv`O-jq%+|6ca}+xwYi_4ZGf7G2dV{SXF>7PcgBcNd0k5L{6|#S|#Q
zS>O>_%)r1c48n{Iv*t(u1=&kHeO=jKu*itA>i#~tg&7!=>7Fi*Ar-gY-Z9KOWFXOS
zaes%kgW2huH+C=uO}o>qo#yyRB4<HP0e5-R%Bc&QcIdwE6@0`!&6mSVh!JQYHt;7h
z_WIPfWzk>$ht+>uBkQ4g)S~aI+Jd^fbuKPfVi<pY{f(;Y%7tyYnYXvS`2YXkpVdFo
zHt)Qb9anU2<L$S0%l>@$HT9Qi`rf*~`xvVZ|8wr|IB6L!%kua6cllWiwfEi6?YzZx
zp}wyE+vK?~cCEW21C;stynoM+0*fOSeHXviy12~zbbaH$>|f>k50+kAIz>q-X=~I`
z1D?rq7rofOtp2;=gAyxOmpk)Z&3T-cOi}x7b*0|-|2yXcA1nUs_-DBB{`>sf%cB^7
zmHs|=^ef!E4dvHOd^2Y)d+~qYzdutSeyxhto9?YM{d9zmn4sX(8aw|o$<1|l|83tK
f_`eqFRi78aGP=gwB@|Q_g8c63>gTe~DWM4fPo9Hd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatelights.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatelights.png
new file mode 100644
index 0000000000000000000000000000000000000000..89a0aa013f8a299e51673a0d39a0936e5bbdc360
GIT binary patch
literal 1054
zcmV+(1mXLMP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkvmAkKpe)uKBOX*4t5af5U@H~5MMY-6^me@v=v%)FuC*vO&XFE
z7e~Rh;NWAi>fqw6tAnc`2tGiZ9h?+hq{ROvg%&X$9QWh9`#$cz1H8>DQw;w&ps1#v
zPQ-;=epLv(!jA|-n8vWk3@w>i%))hi-NVDzyBN=MKlkV8mkS01JOc3?({z(~gLr1s
z)Hv@Ghgn&aiO-40bh;q%BiAK|-#C|S_VUcIo=wjahlzz!7fW5t%DO^4MI4nCmGZqg
zhh@%NoRw;wweQJa7%ZqO8LrceAb}+$k%9mTbyQG=i5RUaDF)KCA9wK&+5Qx{Byv^2
z$gzML6o|GT{11M2YZNCZoTOkJ=y|cMj}aiS3$z-R^?htvtrNia3|y%lf2|43ev;nk
zXwf4ev<+NbcQk1axZD8-pEOYyZOKQ|TPy<aXY@^ZVBi+$TXTAA@8k3V$Wm9!H^9Lm
zFj}JQb(eSdcK7!0nRb6a<)w1fE_Lu$00006VoOIv0E+;N0E?)9lr;bV010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru=mZ=S0u766e!c(z0vkz0K~#9!?c6bL+b|RcVA{ys
zA<zYsLFXuZkOJ8}_6C735p?!Jatzn-U;~~#7@mu=lM)SSEGd#0nBTVrq4J9&ML2-p
z3jqKC0000002*S5VH0AAA<EA%|22G*=mzAc%?GkmA3OEY(>#WzIF95e%y0W)W2_G)
z@<+*^w;uU>;Bj5aPn!<_KxP)JeO#>eap<vaE!US$`OEc1{*eC$zC1n5s<H^zZep?8
z$EqyC%hSVb=uP<ic;71j`SE^~mmv52*MQIb{<CkvwVmB&Ods3hId;k49?$WX=AX5`
z57a^c000000000008{Gy_3b~!TN(1*Da@w6arp`Jo8j;MEdRFi0RVuTr$2!H0Qv*y
z51>DQ{s0-$9{>OV00000003IsB(7<bpZHr#G4Tz^k9NO&yFdH<)b-`^6XtvPdFKNF
z0J#~Z!C<pYe2iWJZSt$K2)n~6N&a$uiMzuoRAmu<{rL8!=Ra@r$NF^rsLEon$#m(E
zQD^`B{x?~Ez4*JsX^{Nw@!a|O4>kWUp-;nwA(}MQi(fB5o0|XTHC;E(M<>b@*I)qv
z00000004lSph{MiuKbMiy#?~U1x|tKDGOJYZV_w(003ZeS8LbR+NYiW*u56!Z3cC%
zHSb%~{+>Ry_I+ylug$+pzk{LkyY^b>+tcC0w{VJU{`Vle)Y{kMhOEy|)t`XG8!!j|
Y08WMP?6|`E@&Et;07*qoM6N<$f}3>i+5i9m

literal 0
HcmV?d00001


From 2b38dbb3106f4994e8688c1db8db62da96c33d64 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 29 Apr 2024 17:31:11 +0000
Subject: [PATCH 08/13] Automatic Changelog (#1293)

---
 Resources/Changelog/Changelog.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1f41467e32a..a21d2e7d664 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4375,3 +4375,13 @@ Entries:
         only. 
   id: 4958
   time: '2024-04-29T17:22:51.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: >-
+        Added Syndicate and Pirate themed hoverbikes, both are considered
+        contraband.
+    - type: Add
+      message: Added syndicate hoverbike flatpack to contravend.
+  id: 4959
+  time: '2024-04-29T17:26:42.0000000+00:00'

From b4d99a01aea231d5a5aabaca9d287d43c637eb80 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 29 Apr 2024 17:33:34 +0000
Subject: [PATCH 09/13] Automatic Changelog (#1292)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a21d2e7d664..f8b7c57c048 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4385,3 +4385,9 @@ Entries:
       message: Added syndicate hoverbike flatpack to contravend.
   id: 4959
   time: '2024-04-29T17:26:42.0000000+00:00'
+- author: Kesiath
+  changes:
+    - type: Tweak
+      message: Reduced top thruster speeds.
+  id: 4960
+  time: '2024-04-29T17:29:13.0000000+00:00'

From 2054cb97196d4d02330e876c96ea2cfb0e0be7eb Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 29 Apr 2024 17:48:50 +0000
Subject: [PATCH 10/13] Automatic Changelog (#1221)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f8b7c57c048..9c5f75daffd 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4391,3 +4391,11 @@ Entries:
       message: Reduced top thruster speeds.
   id: 4960
   time: '2024-04-29T17:29:13.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: >-
+        You can now sell antagonist human like AI like the Syndicate agents to
+        NFSD, as long as they are alive, for NFSD coins.
+  id: 4961
+  time: '2024-04-29T17:48:22.0000000+00:00'

From ab84295a64057d1823d6523d28eac207100ab61c Mon Sep 17 00:00:00 2001
From: Salvantrix <149609610+Salvantrix@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:50:35 -0400
Subject: [PATCH 11/13] 04/29/2024 - Removed Hardsuits (#1308)

* 04/29/2024 - Removed Hardsuits

Removed hardsuits from Black Market Ships.

* 04/29/2024- Grey Pirate Chest

Sneaking in a new color variant for pirate chests, thanks to Stagnation!

* Fix Suit Storage

* BAH

AAAAAAAAAA

* Ships

* 04/29/2024

FIXED FUCKING FUCK

* Update crates.yml

* Update crates.yml

* Update schooner.yml

* Update menace.yml

* Map

---------

Co-authored-by: Dvir <dvirf01@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 Resources/Maps/_NF/POI/cove.yml               | 269 +++++++------
 .../_NF/Shuttles/BlackMarket/barnacle.yml     |  56 +--
 .../_NF/Shuttles/BlackMarket/bocakillo.yml    | 334 ++++------------
 .../Maps/_NF/Shuttles/BlackMarket/menace.yml  | 126 ++----
 .../_NF/Shuttles/BlackMarket/schooner.yml     | 360 ++++++------------
 .../Structures/Storage/Crates/crates.yml      |  13 +-
 .../_NF/Shipyard/BlackMarket/menace.yml       |   2 +-
 .../Crates/piratechestgrey.rsi/crate.png      | Bin 0 -> 438 bytes
 .../Crates/piratechestgrey.rsi/crate_door.png | Bin 0 -> 527 bytes
 .../Crates/piratechestgrey.rsi/crate_icon.png | Bin 0 -> 619 bytes
 .../Crates/piratechestgrey.rsi/crate_open.png | Bin 0 -> 286 bytes
 .../Crates/piratechestgrey.rsi/meta.json      |  40 ++
 .../Crates/piratechestgrey.rsi/sparking.png   | Bin 0 -> 206 bytes
 .../Crates/piratechestgrey.rsi/welded.png     | Bin 0 -> 17749 bytes
 14 files changed, 458 insertions(+), 742 deletions(-)
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_door.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_icon.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_open.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/sparking.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/welded.png

diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml
index 6835d3b66dc..b4adf4a0ad9 100644
--- a/Resources/Maps/_NF/POI/cove.yml
+++ b/Resources/Maps/_NF/POI/cove.yml
@@ -265,7 +265,7 @@ entities:
             color: '#951710FF'
             id: Caution
           decals:
-            323: -13,27
+            322: -13,27
         - node:
             color: '#A4610696'
             id: CheckerNWSE
@@ -303,15 +303,15 @@ entities:
             176: -5,3
             184: -8,8
             185: -2,10
-            327: -3,4
-            328: -7,4
-            333: -5,14
-            334: 6,13
-            337: -8,15
-            339: -6,15
-            340: -3,15
-            344: -1,14
-            345: 6,10
+            326: -3,4
+            327: -7,4
+            332: -5,14
+            333: 6,13
+            336: -8,15
+            338: -6,15
+            339: -3,15
+            343: -1,14
+            344: 6,10
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -323,9 +323,9 @@ entities:
             193: -2,12
             194: -3,12
             195: -4,6
-            324: -1,9
-            325: -1,10
-            326: -4,4
+            323: -1,9
+            324: -1,10
+            325: -4,4
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -346,16 +346,16 @@ entities:
             186: -3,10
             189: -5,10
             190: -4,10
-            335: 6,11
-            336: 7,12
-            341: -4,15
-            342: -3,14
-            343: 0,14
-            346: 7,10
-            347: 7,11
-            348: 6,11
-            349: 7,12
-            350: 6,12
+            334: 6,11
+            335: 7,12
+            340: -4,15
+            341: -3,14
+            342: 0,14
+            345: 7,10
+            346: 7,11
+            347: 6,11
+            348: 7,12
+            349: 6,12
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -367,11 +367,11 @@ entities:
             174: -5,4
             175: -5,3
             188: -5,12
-            329: -7,3
-            330: -4,2
-            331: 0,12
-            332: -1,12
-            338: -7,15
+            328: -7,3
+            329: -4,2
+            330: 0,12
+            331: -1,12
+            337: -7,15
         - node:
             color: '#FFFFFFFF'
             id: FlowersBROne
@@ -442,7 +442,7 @@ entities:
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            351: 10,22
+            350: 10,22
         - node:
             color: '#A46106FF'
             id: WarnCornerNE
@@ -733,7 +733,7 @@ entities:
             color: '#791500FF'
             id: space
           decals:
-            354: 8,22
+            351: 8,22
         - node:
             cleanable: True
             color: '#951710FF'
@@ -777,8 +777,7 @@ entities:
             0: 56785
           1,2:
             0: 52237
-            1: 256
-            2: 4096
+            1: 4352
           1,3:
             1: 1
             0: 65484
@@ -788,12 +787,12 @@ entities:
             0: 65535
           2,0:
             0: 8247
-            3: 128
+            2: 128
           2,1:
             0: 560
           2,2:
             0: 4131
-            4: 128
+            3: 128
           2,3:
             0: 65329
           2,-1:
@@ -801,7 +800,7 @@ entities:
           2,4:
             0: 4927
           3,2:
-            4: 3952
+            3: 3952
           3,3:
             0: 65280
           3,-1:
@@ -809,13 +808,13 @@ entities:
           3,4:
             0: 7
           4,2:
-            4: 768
+            3: 768
           -4,3:
             0: 65024
           -4,4:
             0: 61167
           -4,2:
-            4: 608
+            3: 608
           -4,-1:
             0: 34944
           -3,3:
@@ -825,7 +824,7 @@ entities:
           -3,4:
             0: 65535
           -3,0:
-            3: 32
+            2: 32
             0: 32908
           -3,1:
             0: 34952
@@ -848,27 +847,27 @@ entities:
           -1,4:
             0: 65535
           -3,-2:
-            3: 8256
+            2: 8256
             0: 34816
           -2,-3:
             0: 28672
           -2,-2:
             0: 65399
           -1,-2:
-            3: 16
+            2: 16
             0: 61440
           0,-2:
             0: 61440
           1,-2:
             0: 65228
-            3: 16
+            2: 16
           1,-3:
             0: 49152
           2,-3:
             0: 4096
           2,-2:
             0: 13073
-            3: 32832
+            2: 32832
           -4,5:
             0: 61422
           -4,6:
@@ -906,85 +905,85 @@ entities:
           1,5:
             0: 65535
           1,6:
-            0: 61439
+            0: 53247
           1,7:
             0: 52428
           2,5:
-            0: 32625
+            0: 24401
           2,6:
             0: 13073
           2,7:
             0: 64977
           3,5:
-            4: 4368
-            3: 11808
+            3: 4368
+            2: 11808
           3,7:
             0: 32752
           3,6:
-            3: 2
-            4: 128
+            2: 2
+            3: 128
           4,5:
-            3: 20256
-            4: 3
+            2: 20256
+            3: 3
           4,6:
-            4: 28
+            3: 28
           4,7:
-            4: 2248
+            3: 2248
           4,8:
-            4: 780
+            3: 780
           5,4:
-            4: 1
-            3: 57344
+            3: 1
+            2: 57344
           5,5:
-            3: 53196
+            2: 53196
           5,7:
-            4: 4352
+            3: 4352
           5,3:
-            4: 4352
+            3: 4352
           5,6:
-            3: 236
+            2: 236
           5,8:
-            4: 1
+            3: 1
           6,4:
-            3: 4096
+            2: 4096
           6,5:
-            3: 4369
+            2: 4369
           6,6:
-            3: 17
+            2: 17
           4,3:
-            4: 2048
+            3: 2048
           -5,3:
-            4: 272
+            3: 272
           -5,2:
-            4: 8192
+            3: 8192
           -5,4:
-            4: 256
+            3: 256
           -5,5:
-            4: 256
+            3: 256
           -5,6:
-            4: 4096
+            3: 4096
           -5,8:
-            4: 2082
+            3: 2082
           -3,8:
-            4: 8192
+            3: 8192
           -3,9:
-            4: 2176
+            3: 2176
           -2,9:
             0: 2188
           -1,9:
             0: 2047
           0,8:
-            4: 49152
+            3: 49152
           0,9:
-            4: 12
+            3: 12
           1,8:
-            4: 28672
+            3: 28672
           1,9:
-            4: 1
+            3: 1
           2,8:
-            4: 3072
+            3: 3072
           3,8:
-            4: 3840
+            3: 3840
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -1016,21 +1015,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 235
-          moles:
-          - 21.813705
-          - 82.06108
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         - volume: 2500
           immutable: True
           moles:
@@ -5600,6 +5584,18 @@ entities:
     - type: Transform
       pos: -3.5,5.5
       parent: 1
+- proto: DoubleEmergencyAirTankFilled
+  entities:
+  - uid: 2060
+    components:
+    - type: Transform
+      pos: 10.402694,21.702908
+      parent: 1
+  - uid: 2061
+    components:
+    - type: Transform
+      pos: 10.652694,21.650824
+      parent: 1
 - proto: Dresser
   entities:
   - uid: 1697
@@ -5925,7 +5921,7 @@ entities:
       pos: 7.5,28.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1742.1683
+      secondsUntilStateChange: -2234.199
       state: Opening
 - proto: FenceWoodSmallCorner
   entities:
@@ -6389,16 +6385,6 @@ entities:
     - type: Transform
       pos: 3.5,20.5
       parent: 1
-  - uid: 702
-    components:
-    - type: Transform
-      pos: 6.5,26.5
-      parent: 1
-  - uid: 703
-    components:
-    - type: Transform
-      pos: 6.5,25.5
-      parent: 1
   - uid: 706
     components:
     - type: Transform
@@ -8028,6 +8014,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,-4.5
       parent: 1
+- proto: PinpointerUniversal
+  entities:
+  - uid: 2062
+    components:
+    - type: Transform
+      pos: -0.5275769,-4.42351
+      parent: 1
 - proto: PirateFlag
   entities:
   - uid: 498
@@ -8342,11 +8335,11 @@ entities:
     - type: Transform
       pos: 10.5,23.5
       parent: 1
-  - uid: 1194
+  - uid: 1641
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 8.5,21.5
+      pos: 8.5,19.5
       parent: 1
   - uid: 1854
     components:
@@ -8434,6 +8427,12 @@ entities:
     - type: Transform
       pos: -1.5,13.5
       parent: 1
+  - uid: 2059
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,21.5
+      parent: 1
 - proto: Railing
   entities:
   - uid: 3
@@ -8901,11 +8900,6 @@ entities:
     - type: Transform
       pos: 6.5,17.5
       parent: 1
-  - uid: 1604
-    components:
-    - type: Transform
-      pos: 8.5,24.5
-      parent: 1
   - uid: 1804
     components:
     - type: Transform
@@ -9536,18 +9530,42 @@ entities:
     - type: Transform
       pos: -8.5,11.5
       parent: 1
-- proto: SuitStorageEVAPirate
+- proto: SuitStorageWallmountEVAPirate
   entities:
-  - uid: 1193
+  - uid: 1194
     components:
     - type: Transform
-      pos: 10.5,21.5
+      rot: -1.5707963267948966 rad
+      pos: 9.5,24.5
       parent: 1
-  - uid: 1641
+    - type: Physics
+      canCollide: False
+  - uid: 1604
     components:
     - type: Transform
-      pos: 10.5,23.5
+      rot: -1.5707963267948966 rad
+      pos: 9.5,21.5
+      parent: 1
+    - type: Physics
+      canCollide: False
+  - uid: 2058
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,23.5
       parent: 1
+    - type: Physics
+      canCollide: False
+- proto: SuitStorageWallmountPirateCap
+  entities:
+  - uid: 702
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,20.5
+      parent: 1
+    - type: Physics
+      canCollide: False
 - proto: SurveillanceCameraRouterSupply
   entities:
   - uid: 308
@@ -9995,6 +10013,13 @@ entities:
     - type: Transform
       pos: -5.323082,7.791107
       parent: 1
+- proto: VendingMachineTankDispenserEVA
+  entities:
+  - uid: 1193
+    components:
+    - type: Transform
+      pos: 10.5,23.5
+      parent: 1
 - proto: WallmountTelevisionFrame
   entities:
   - uid: 737
@@ -10735,6 +10760,11 @@ entities:
     - type: Transform
       pos: -13.5,11.5
       parent: 1
+  - uid: 703
+    components:
+    - type: Transform
+      pos: 5.5,27.5
+      parent: 1
   - uid: 956
     components:
     - type: Transform
@@ -12725,6 +12755,13 @@ entities:
       parent: 1875
     - type: Physics
       canCollide: False
+- proto: WeaponGrapplingGun
+  entities:
+  - uid: 2063
+    components:
+    - type: Transform
+      pos: 0.49590623,-4.4579954
+      parent: 1
 - proto: WeaponRackPistolBase
   entities:
   - uid: 1875
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml
index a72bb320f79..3a0a2c667eb 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml
@@ -89,32 +89,27 @@ entities:
       version: 2
       data:
         tiles:
-          -1,-1:
-            0: 65535
-          0,-1:
-            0: 4375
-            1: 26208
           -2,-1:
-            0: 61166
+            0: 28224
+          -2,0:
+            0: 14
+            1: 35840
           -2,-2:
             1: 51200
+          -1,-1:
+            0: 65520
           -1,-2:
             1: 1
-            0: 65534
+            0: 61120
+          -1,0:
+            0: 61059
           0,-2:
-            0: 30579
+            0: 13072
             1: 4
+          0,-1:
+            1: 26208
           0,0:
-            0: 30583
-          0,1:
-            0: 7
-          -2,0:
-            0: 238
-            1: 35840
-          -1,0:
-            0: 65535
-          -1,1:
-            0: 15
+            0: 13104
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -132,7 +127,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -693,7 +688,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,1.5
       parent: 201
-- proto: ComputerTabletopShuttle
+- proto: ComputerTabletopShuttleAntag
   entities:
   - uid: 220
     components:
@@ -708,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
@@ -1482,20 +1470,6 @@ entities:
     - type: Transform
       pos: -1.5,-6.5
       parent: 201
-- proto: SuitStorageEVAPirate
-  entities:
-  - uid: 67
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 201
-- proto: SuitStoragePirateCap
-  entities:
-  - uid: 62
-    components:
-    - type: Transform
-      pos: -0.5,3.5
-      parent: 201
 - proto: Table
   entities:
   - uid: 147
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
index 1ee842eac32..edff0ed5272 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
@@ -65,105 +65,105 @@ entities:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            60: -1,-2
-            61: 0,-2
-            62: 0,-3
-            63: -1,-3
+            0: -1,-2
+            1: 0,-2
+            2: 0,-3
+            3: -1,-3
         - node:
             color: '#FFFFFFFF'
             id: BotGreyscale
           decals:
-            64: 0,0
+            4: 0,0
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            103: -1,0
-            104: -3,1
-            105: -1,2
-            106: 2,1
-            107: 1,-1
-            108: 0,3
-            109: 0,8
-            110: 2,4
-            111: 2,2
-            112: 1,-4
-            113: 0,-4
-            114: -1,-4
-            115: 1,-4
-            116: 0,-4
-            117: -1,-4
-            118: -1,9
-            119: -1,10
-            120: -1,11
-            121: 0,11
-            122: 1,11
-            123: 1,10
-            124: 1,10
+            36: -1,0
+            37: -3,1
+            38: -1,2
+            39: 2,1
+            40: 1,-1
+            41: 0,3
+            42: 0,8
+            43: 2,4
+            44: 2,2
+            45: 1,-4
+            46: 0,-4
+            47: -1,-4
+            48: 1,-4
+            49: 0,-4
+            50: -1,-4
+            51: -1,9
+            52: -1,10
+            53: -1,11
+            54: 0,11
+            55: 1,11
+            56: 1,10
+            57: 1,10
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            77: -3,1
-            78: -2,0
-            79: -1,0
-            80: 0,0
-            81: 1,0
-            82: 2,0
-            83: 2,1
-            84: 0,-2
-            85: -1,-2
-            86: -1,-3
-            87: 0,-3
-            88: 2,2
-            89: 2,4
-            90: 2,3
-            91: 0,3
-            92: -3,2
-            93: -1,4
-            94: -1,5
-            95: -1,6
-            96: -1,7
-            97: -1,9
-            98: -1,10
-            99: -1,11
-            100: 0,11
-            101: 1,11
-            102: 1,10
-            125: 2,0
-            126: -2,0
-            127: 0,-2
-            128: -1,-3
-            129: -1,4
-            130: -1,5
-            131: -1,6
-            132: -1,7
-            133: -1,6
-            134: -1,6
-            135: -1,6
+            10: -3,1
+            11: -2,0
+            12: -1,0
+            13: 0,0
+            14: 1,0
+            15: 2,0
+            16: 2,1
+            17: 0,-2
+            18: -1,-2
+            19: -1,-3
+            20: 0,-3
+            21: 2,2
+            22: 2,4
+            23: 2,3
+            24: 0,3
+            25: -3,2
+            26: -1,4
+            27: -1,5
+            28: -1,6
+            29: -1,7
+            30: -1,9
+            31: -1,10
+            32: -1,11
+            33: 0,11
+            34: 1,11
+            35: 1,10
+            58: 2,0
+            59: -2,0
+            60: 0,-2
+            61: -1,-3
+            62: -1,4
+            63: -1,5
+            64: -1,6
+            65: -1,7
+            66: -1,6
+            67: -1,6
+            68: -1,6
         - node:
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            69: 1,-1
+            7: 1,-1
         - node:
             color: '#FFFFFFFF'
             id: StandClearGreyscale
           decals:
-            72: 0,8
-            73: 0,3
+            8: 0,8
+            9: 0,3
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleN
           decals:
-            65: 2,1
+            5: 2,1
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            68: 2,3
+            6: 2,3
     - type: GridAtmosphere
       version: 2
       data:
@@ -251,7 +251,7 @@ entities:
       pos: 1.5,-0.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -93.89965
+      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,61 +1530,34 @@ entities:
         - Pressed: Trigger
         75:
         - Pressed: Trigger
-- proto: SpawnPointLatejoin
-  entities:
-  - uid: 158
-    components:
-    - type: Transform
-      pos: 0.5,6.5
-      parent: 2
 - proto: SpawnPointPirate
   entities:
-  - uid: 164
+  - uid: 158
     components:
     - type: Transform
       pos: 0.5,7.5
       parent: 2
-- proto: SubstationBasic
+- proto: SpawnPointPirateCaptain
   entities:
-  - uid: 102
+  - uid: 156
     components:
     - type: Transform
-      pos: -0.5,7.5
+      pos: 0.5,6.5
       parent: 2
-- proto: SuitStoragePirateCap
+- proto: SpawnPointPirateFirstMate
   entities:
-  - uid: 156
+  - uid: 76
     components:
     - type: Transform
-      pos: -0.5,9.5
+      pos: 0.5,5.5
       parent: 2
-- proto: SuitStorageWallmountEVAPirate
+- proto: SubstationBasic
   entities:
-  - uid: 76
+  - uid: 102
     components:
     - type: Transform
-      pos: -0.5,3.5
+      pos: -0.5,7.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: Physics
-      canCollide: False
 - proto: TableReinforced
   entities:
   - uid: 14
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml
index cbd42f342e5..7e6298b48d6 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml
@@ -96,23 +96,22 @@ entities:
       data:
         tiles:
           0,0:
-            0: 30583
+            0: 13107
             1: 34952
           0,-1:
-            0: 30579
-            1: 4
-          -1,-1:
-            1: 36
-            0: 61128
+            0: 13104
+            2: 4
           -1,0:
-            0: 52974
+            0: 36076
             1: 8192
           0,1:
-            0: 3
             1: 12
+          -1,-1:
+            0: 51328
+            1: 32
+            2: 4
           -1,1:
             1: 6
-            0: 8
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -129,6 +128,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -150,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
@@ -224,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:
@@ -554,7 +554,7 @@ entities:
     - type: Transform
       pos: 1.5,3.5
       parent: 103
-- proto: ComputerTabletopShuttle
+- proto: ComputerTabletopShuttleAntag
   entities:
   - uid: 95
     components:
@@ -569,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
@@ -725,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
@@ -741,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
@@ -778,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
@@ -929,13 +893,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,0.5
       parent: 103
-- proto: SuitStorageEVAPirate
-  entities:
-  - uid: 123
-    components:
-    - type: Transform
-      pos: 0.5,0.5
-      parent: 103
 - proto: TableCarpet
   entities:
   - uid: 32
@@ -1136,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
 ...
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
index 0059d9bacd9..e8c142d918a 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
@@ -428,58 +428,67 @@ entities:
       data:
         tiles:
           0,0:
-            0: 65535
-          0,-1:
-            0: 65535
+            0: 65294
           -1,0:
-            0: 63487
-            1: 2048
-          -1,-1:
-            0: 65407
-            1: 128
+            0: 60942
           0,1:
-            0: 65535
+            0: 59455
+          -1,1:
+            0: 57998
           0,2:
-            0: 65535
+            0: 14190
+          -1,2:
+            0: 35854
+            1: 256
           0,3:
-            0: 13175
+            0: 3
+            1: 13056
+          -1,3:
+            0: 8
+            1: 34816
+          0,4:
+            1: 273
+          0,-1:
+            0: 57599
+          1,2:
+            1: 256
           1,0:
-            0: 30515
+            1: 17410
+            2: 8704
           1,1:
-            0: 4919
-          1,2:
-            0: 273
+            2: 2
+            1: 516
+          1,-1:
+            1: 8260
+            2: 34
           0,-3:
-            0: 65280
+            0: 29184
+          -1,-3:
+            0: 51200
+            1: 256
           0,-2:
-            0: 65535
+            0: 49663
+          -1,-2:
+            0: 24814
+          -1,-1:
+            0: 57582
           1,-3:
-            0: 4352
+            1: 256
           1,-2:
-            0: 29489
-          1,-1:
-            0: 13175
+            1: 16416
+            2: 8192
           -2,0:
-            0: 52360
+            1: 17416
+            2: 34816
           -2,1:
-            0: 2188
-          -1,1:
-            0: 65535
-          -1,2:
-            0: 61439
-          -1,3:
-            0: 35020
-          -2,-2:
-            0: 51328
+            1: 2052
+            2: 8
           -2,-1:
-            0: 35020
-          -1,-3:
-            0: 48896
-            1: 16384
-          -1,-2:
-            0: 65535
-          0,4:
-            0: 273
+            1: 32836
+            2: 136
+          -2,-2:
+            1: 16512
+            2: 32768
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -497,10 +506,25 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
           moles:
-          - 20.078888
-          - 75.53487
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -1815,47 +1839,24 @@ entities:
     - type: Transform
       pos: 3.5,0.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 204
-          - 203
-          - 202
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: ClosetWallEmergencyFilledRandom
-  entities:
-  - uid: 205
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-4.5
-      parent: 1
-  - uid: 206
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-8.5
-      parent: 1
-- proto: ClosetWallFireFilledRandom
-  entities:
-  - uid: 207
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,1.5
-      parent: 1
-  - uid: 208
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-8.5
-      parent: 1
+    - 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
 - proto: ClosetWallMaintenanceFilledRandom
   entities:
   - uid: 209
@@ -1863,13 +1864,26 @@ entities:
     - type: Transform
       pos: -0.5,6.5
       parent: 1
+    - 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
 - proto: ClothingEyesEyepatch
   entities:
-  - uid: 210
-    components:
-    - type: Transform
-      pos: -0.3120169,12.330579
-      parent: 1
   - uid: 211
     components:
     - type: Transform
@@ -1880,14 +1894,14 @@ entities:
   - uid: 212
     components:
     - type: Transform
-      pos: 1.2214307,2.6089354
+      pos: -0.4273789,2.6294885
       parent: 1
 - proto: ClothingHeadHatPirate
   entities:
   - uid: 213
     components:
     - type: Transform
-      pos: 1.5811653,12.328757
+      pos: 1.4499189,12.408553
       parent: 1
 - proto: ClothingHeadHatPirateTricord
   entities:
@@ -1896,40 +1910,13 @@ entities:
     - type: Transform
       pos: -0.27106684,-0.46582198
       parent: 1
-- proto: ClothingNeckCloakPirateCap
-  entities:
-  - uid: 202
-    components:
-    - type: Transform
-      parent: 201
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingOuterCoatJensen
   entities:
   - uid: 215
     components:
     - type: Transform
-      pos: -0.3756531,12.328757
+      pos: -0.3953849,12.460637
       parent: 1
-- proto: ClothingOuterCoatPirate
-  entities:
-  - uid: 203
-    components:
-    - type: Transform
-      parent: 201
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitPirate
-  entities:
-  - uid: 204
-    components:
-    - type: Transform
-      parent: 201
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ComputerIFF
   entities:
   - uid: 216
@@ -1946,7 +1933,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,8.5
       parent: 1
-- proto: ComputerShuttle
+- proto: ComputerShuttleAntag
   entities:
   - uid: 218
     components:
@@ -1963,6 +1950,11 @@ entities:
       parent: 1
 - proto: CrateEmptySpawner
   entities:
+  - uid: 203
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
   - uid: 220
     components:
     - type: Transform
@@ -1983,33 +1975,13 @@ entities:
     - type: Transform
       pos: 1.5,-2.5
       parent: 1
-- proto: CrateFunPirate
-  entities:
-  - uid: 225
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-- proto: CratePirateChest
-  entities:
-  - uid: 224
-    components:
-    - type: Transform
-      pos: -0.5,5.5
-      parent: 1
-- proto: CratePirateChestCaptain
-  entities:
-  - uid: 274
-    components:
-    - type: Transform
-      pos: -0.5,2.5
-      parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 228
+  - uid: 202
     components:
     - type: Transform
-      pos: 2.5,5.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,-4.5
       parent: 1
 - proto: DresserFilled
   entities:
@@ -2108,13 +2080,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,9.5
       parent: 1
-- proto: FoodMealNachosCuban
-  entities:
-  - uid: 244
-    components:
-    - type: Transform
-      pos: 2.418281,9.579869
-      parent: 1
 - proto: GravityGeneratorMini
   entities:
   - uid: 245
@@ -2309,13 +2274,6 @@ entities:
     - type: Transform
       pos: 2.3989987,-8.34466
       parent: 1
-- proto: PinpointerUniversal
-  entities:
-  - uid: 280
-    components:
-    - type: Transform
-      pos: 0.67992365,2.5024152
-      parent: 1
 - proto: PirateFlag
   entities:
   - uid: 281
@@ -2470,6 +2428,11 @@ entities:
       parent: 1
 - proto: Rack
   entities:
+  - uid: 204
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 1
   - uid: 304
     components:
     - type: Transform
@@ -2662,21 +2625,6 @@ entities:
     - type: Transform
       pos: 3.5,-0.5
       parent: 1
-  - uid: 337
-    components:
-    - type: Transform
-      pos: -1.5,4.5
-      parent: 1
-  - uid: 338
-    components:
-    - type: Transform
-      pos: 2.5,7.5
-      parent: 1
-  - uid: 339
-    components:
-    - type: Transform
-      pos: 1.5,9.5
-      parent: 1
 - proto: RemoteSignaller
   entities:
   - uid: 505
@@ -2722,6 +2670,8 @@ entities:
     - type: Transform
       pos: -0.51266235,8.61944
       parent: 1
+    - type: Stack
+      count: 15
 - proto: ShuttersNormal
   entities:
   - uid: 341
@@ -3004,13 +2954,6 @@ entities:
       parent: 1
     - type: SpamEmitSound
       enabled: False
-- proto: SpawnMobParrot
-  entities:
-  - uid: 372
-    components:
-    - type: Transform
-      pos: 0.5,4.5
-      parent: 1
 - proto: SpawnPointPirate
   entities:
   - uid: 373
@@ -3047,40 +2990,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,7.5
       parent: 1
-- proto: SuitStorageEVAPirate
-  entities:
-  - uid: 378
-    components:
-    - type: Transform
-      pos: 3.5,7.5
-      parent: 1
-- proto: SuitStoragePirateCap
+- proto: TableCarpet
   entities:
-  - uid: 379
+  - uid: 205
     components:
     - type: Transform
-      pos: -1.5,-8.5
+      pos: -0.5,2.5
       parent: 1
-    - 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
-- proto: TableCarpet
-  entities:
   - uid: 380
     components:
     - type: Transform
@@ -3584,34 +3500,6 @@ entities:
     - type: Transform
       pos: 0.5,3.5
       parent: 1
-- proto: WeaponGrapplingGun
-  entities:
-  - uid: 471
-    components:
-    - type: Transform
-      pos: 0.44128692,2.693194
-      parent: 1
-- proto: WeaponLauncherPirateCannon
-  entities:
-  - uid: 472
-    components:
-    - type: Transform
-      pos: 0.4072001,5.6771774
-      parent: 1
-- proto: WeaponRevolverPirate
-  entities:
-  - uid: 473
-    components:
-    - type: Transform
-      pos: 0.6162869,5.484689
-      parent: 1
-- proto: WeaponShotgunBlunderbuss
-  entities:
-  - uid: 474
-    components:
-    - type: Transform
-      pos: 0.5503819,5.2956195
-      parent: 1
 - proto: Window
   entities:
   - uid: 475
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
index 5679150b0ff..6f57c3f7fc5 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
@@ -195,4 +195,15 @@
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/nfsd_secure2.rsi
   - type: AccessReader
-    access: [["Security"]]
\ No newline at end of file
+    access: [["Security"]]
+
+- type: entity
+  parent: CratePirate
+  id: CratePirateGrey
+  name: pirate chest
+  description: A space pirate chest, not for station lubbers.
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi
+  - type: Icon
+    sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi
diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml
index c4f99e02454..f7afc7bdd73 100644
--- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml
+++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml
@@ -12,7 +12,7 @@
   id: Menace
   name: Menace
   description: 'Mail is no longer an option: you either receive it or you die.'
-  price: 50000
+  price: 21000
   category: Small
   group: BlackMarket
   shuttlePath: /Maps/_NF/Shuttles/BlackMarket/menace.yml
diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb02df2e4c138734bffc322f30991e485d1b0363
GIT binary patch
literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$a7jc#R9J=WmN9F>P!vW_Y$iL_L2$5$lx8Re5h)7A&8~uLC!uu6?jOm}rBmrv
zaCVb|MT!V%3n@jU>8!DfPL|i9jZ_nC2qbavEO|Wcz2C>Z$;*Q+Ted`uB!r06KrB-A
zO)ww>6l-eebI5&NNm_G`T&$@gdwfErln+h3)#=gK5r8BER7!cy3fa&M01Wgl@H+yV
zn|hf<dN(l9kvZl3y1lgLcnL@5G%#^DmO5YzXDFF?U?z;=%(3U_fLl;d;;_;Ib37xx
z7Z1#YIrh*2x1gZJVWk5>n{Z<@j$)hJr<Z69q>>4qKR!bfO(heHwIqbV{vU+JK=1N!
zr%CW<1n;kX0F<}3ry|Bdd9n7BV<W3o8Fnt&Kg>}n<+*SC6jL(swZ%^B7qmJ(UpWK4
zi&~Y@nsZ`WbM6TIuaFyla$o~K!^jORodXlg;;5l{PA(`J0M9uS%UW;X(HMFbhvCZ8
g9}5Ha6)9}K0rXgXBAwOS)c^nh07*qoM6N<$g4avC*#H0l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_door.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b948b1073eb8377406a2fb71634b91520f4c877
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$$w@>(R9J=WmOn@WQ5?s=PbH|72yG6mC2EL@2t8`l1_w!noFW_~ZfJ>`G9-kC
zAgG`rqzob|NRU7q8p1*(ZYpSypgE+WB8u!a=)=FKmzFu)XMFsA-|zSR-rc<eWMpLi
z8A2(|TQJyoDpFfBSH~M9&zumb3e7`1Yj{jP{knOFwjBl=PX|(4WaH#B8-h)MnFGMV
z+*nz$HjNtNi>C<36EF{VORfh1%hW7bh@uG;Hi@Cr>1wWLD1h|t{i`0)qTj^7>Vcqi
zQ{I~1yTV}Osn5Gq7juTsy97b$ra)!_|4HKo&@_GhiIJFY$+w_Qqb~d8)><zbARJG?
z&gtP;4pnS?{s8Qp9>ABRdZs_vr7a!67l^=Q9KuobUXoa~_yQ43Pne4XFfQhul7vQA
z_7S<fhRHbeqn<)Uzl1&dma<}YPM<jf;6h?gDN4SEm4s&Y&cRt+007S7!un;bDsv!b
z0_<ESch9O4>h}aC)#aW)khu+cs|q8%%|9}9EG8*uaUmMo#-UeBDtBaw-M#?;HiIds
z*rg!cy#oMVANnMT2zP1{4ZY9>r<zFZY3;lzS}Xb^swaey2D}U80CIqO^9>?1iB#ve
RzbgO$002ovPDHLkV1mJq<-Py_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..afecdb012ebb60998d193c414ca4daf204552470
GIT binary patch
literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%B}qg<R9J=WmoaD)Q5eU6FAWaTP^58}Si}sX#8M<Zszaf5$RH*Kozxz+NCp>)
zlPw~F3_`&O9fD{Dkt$dSLgOG(5(%LMI<-hB?qV{yiRn2cFT~_>d3Ur)!Ty(nkMH~c
z|M$M{y>}-J!=PUfLg4C~dL4Z?;BE~B!_fol$=CNuVQC;3jvDEgOZ@m**>~}i!zT!a
zqeh^*ERrAoG~z-Ip%e#r`{1%A*^p<DtB*diUMMj=Hlmyl5W00AX+j85TLH6WAMy-#
zB=mZ{rXs5O#esPP5CASI{^IF^<y-6*q>j{e0mL6K_C#EwS+DQg@bDS%9NRk(p-#MQ
z2NBdJ+HBH0!ESy>1M7tn5zWWUlXTa@U%w%u`G7s8e93?D^su>s_)3PU@loDoca_MT
zBEFL0&h_bb0}>mtn@U6zi8o|&n@o+5+Nx=V=?nn)ea9`yBATz>0@zTjF@xzg>_&9&
z^=Gt@4uBTYd6vsN5{IT0kbSxF>XRd)3kz#XdCmQY`fV5tM~#v5muv~9Vl!wVooqUV
zo>;Y2TiVJKs4k1=YgOFQYi<~r=lf0(0ROiyN+gpzMY8D>leZr#*KD7;(iUs9;MCbb
zeWGh*-FiAPJBOZF<?ig9t(r`3lhRhc5py+vok%ztD5pbs_%5Sf<DY}5QZ92YmQ*et
z^Vbd{)tXAVY;B;hZRZ}?ZFxFF!$9+7_7dXg-|)XT@E2xWs~*15Zw3GW002ovPDHLk
FV1k||9BKdn

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_open.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..9892e43a155a929ddb9e28748b0429271b93d5cb
GIT binary patch
literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}H#}V&Ln2y}
z|NQ@N&un=>OND*i#TV~+j%mLBKOu)rSy`ExdspI-rZ;P3*!Yb_+hmu&Gw_*v?8AL6
zm3EcCZuRK~Mg~9-#g_j6{+<M;mEVGSYJ|BY`qs}qb%IHFMUhGJg^)*!b{@U{zBW1I
zc0Jd*cIyWZZ|9qAmyu3ze8$tFJmW>4vXlcSV`bv4<&0kf+N>SoW_0Uy3dkN<+z>Zy
z@$JKh4jecTaASYd!uofNyDS*e<arDxMT-P88yFe!)#yo-9$3NbCTsAjA&|YtD&Y#_
gVm_cygEa%ggh1m$tK{%?KtD2gy85}Sb4q9e0B<L48vp<R

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/meta.json
new file mode 100644
index 00000000000..584e2b36659
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Made by Stagnation for use on Frontier Server.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "crate"
+    },
+    {
+      "name": "crate_door"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "crate_icon"
+    },
+    {
+        "name": "sparking",
+        "directions": 1,
+        "delays": [
+            [
+                0.1,
+                0.1,
+                0.1,
+                0.1,
+                0.1,
+                0.1
+            ]
+        ]
+    },
+    {
+      "name": "crate_open"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/sparking.png
new file mode 100644
index 0000000000000000000000000000000000000000..87b78b9b4653d54a703643d161f7f8bf353995df
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?$P6U!|9apHq&N#aB8wRqxP?HN@zUM8KR`jY
z0G|+7ApQUUOh%6A4L}xSNswPKgTu2MX+Tb*r;B5V#`)v~iN*%b)hn0<iW?-j0@yqn
z4l<t-bPUtt2wuhz${5C!WO85%2SXwECOO7A=K>QXSZ^$5X5FCBs<N0_$7N#k)QyZ%
w!U;<~FT4n7bY0A#vqqd@>LJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7b469bb46d6d8c2c03890c04e684c0940c97a7b
GIT binary patch
literal 17749
zcmeI4e{3699l)<yvu-KfhUiLEe(3O+G)B+&)4vYKTWYr?Xl_H|(xj{+=X>vxTkSjd
z?vgl`HY(T{8`2m|VjY?g;}6i77)+qHz@%pUD4PZ>f6z@Jv=)TK#;<KEbV6dlJKx!U
zcI-ZPDIlb0CGj`!zCYf5zTf-4clXELGqLA`TZXm|F$}Y1d@MJKzFGhGip$Yow^sWr
z`ns|*HsdnP=C}F38<;OXJj^iJBW7XRo6g^&>UKG*0lNsJ)p7-CGfeuXYDLozL60rM
zInx@6yz>2%5!M7Fk^Ql}kgsInyg62L;8bl-L9ZRsQy_9vW++`%k%KbyG`3nUS*}_g
ziPZh7NcM;M2wPY24vj=c{ebLreuB-~4rF7|IHwEo1e-`j#aJStBzCZpAjWt>=4FAC
zWK|JVMPkEGBr}Ahv;z!vGPgSnhyELh%zIu%<@u$hrRb6zwVgR$Or=u1An}sKAq~!5
zwmhxMS?+a#lZKxhbalt9c&2T!zF)0qFL)!7h##o=3D2usX$G>~kR77PSG5W+Mg_i`
z5zw19l?A6%pBm74Sb}9}c`mXOyV_OeZO?Y+?H(bUhkFJ_ImzdnvAfQ<T<#j$^>!^H
z1R>I{mTqCW0{Kbk+6#^jcP*k*xvtyUyWS*hWv35UNWH5g&op}Y@sIR`0IOyXGyh0n
zR<Efb)oBDx%{ox?Y^Pw`rA$z+6OCN3*=)T$*&Fto7O<Dx_oewxlUCuhyuqC2!HguJ
zS`-CNkP2c<m1C+Tyk8JiLBN~@njJp!HZYClb{~m?D5}Vf7{h&Fnw>t-g$OiH>&pwS
zi}?Y%YS>O$^D<^xn}dACnoIMoK}@q*o@&-E*$$c(%*biJ+i+K_oUJeT*T<-(Ll-5(
z#gc?lRqp^hwYm1u#(|QV3HlGPbrYzqpaLiYprm4)5-ZA_C_=y`fn4O0vMh=kl#P@D
z(!AdVkc-y5!rBPOyStV}STsaAj$CWnn{|y!DGJbxV?ZoQhU8CCfm~cs3@$0e6fPD6
zpeUu{imn^o=NXK)lfkiHh^t?&`Mf%Axt@lwkLNP}d`vW-I280a&}B}G%Oa;G6~GmB
zN#qieU?>S7qv>e%8g4gl5e!{7q9fPcDMCquiKGBHB`zgHiYZ;<3@Ga;cF{<JWFrvf
zY)zoOj)~SUt%T`Z9NPdz7dLA{jhTLZF1MFUy*{Vl;r7v1eb!f+isrb`@1rA;Mk8%5
zO+m?pg;(##s;2vER7Ur^6GUa&Hrkq2(=r_>m}}G7UwN%D?;T@l9$FXbZh@=1R&OV+
zZFozX14rl3b>C0p4ZOCSb-M3<m0X%c*w!L+E+!Qy;TqZxLDbC*$1bzYCdzs?t5qr`
zQ`h_)^NSV;cNfjx)yOyI<G*;WuC}<ok}E1=F$shem(&1i9)==u$)uuj3XCNUISCUW
zo@$&TR<WI@=qC;<rsjegFGy%H6jiCY7-CwzowV0ZA8UO-CD)pxKCfAG5M=nqnKcGF
zXY?Pe(sgGJC_vVdlEw*8jB~|=B5)}kCOBCGsknjKe@sUUdjRH5WNz&?hGs5o^y}^~
zgqGrWon{Mar0{>!UjTH>i|H`fEcFH^w%$|!f6jT`S7v{^GJ0h;cSL??uJ7*KcV>+Z
z<=UNGW7`^3=Wc(^_HP1E^$|91XpurUvMSaO8(Zmq+i8b++lmo-2jM+Z&)sx?w>!a9
zF=yRk+3Vd<2T{7XX+>+~A=ko<?Vr>BeZGoz<Y;$T-z8<lG{0sH^Hx7L?eDBh3-z5d
zx?4dXUiANlrugAb)0qpK;)gp;TbBDQ)5}O<w2ooS%6}LU+$m3?2XHVGkHzFzn(rL$
zw3slfur!@B(VepE-y6s%Qr)KWKv%<=UWV9#&@i}cut#O}!~~=0K^%Gp$TuGXVmZUF
zyh|*%&gc?5#@*2%I1QpqaS;*W3KSPkgD6v6L`1j(#f8%#$`lt75w1XS;WUUc#YIGf
zD^OfG4WdkO5fR}E6c<i|C{tWSM7RRQh0`F)6c-T@u0V0&G>9_AMMQ)vP+T|-qD*lS
z5#b6H7fypHQ(QzuxB|t6(;&(e7ZDMzKyl$Th%&`RM1(6)TsRG)OmPtr;R+NNPJ<{@
zTtq~;0>y>XAj%XM5fQFHap5$GGQ~wigey>7I1QpqaS;*W3KSPkgD6v6L`1j(#f8%#
z$`lt75w1XS;WUWy1#u0vUaJ8u^e&Ah^wNy)Z2RdZ^ui5RADhfGOznDxIr2${`TM`n
z_sa~kATZ1yW*J63$}n%YKmV~G?`D_{d&hI5h3c>V^!yXI4UArM<ToGB-pmagug$8P
z-!uKA*%xnqb@2SkQgZ5^yJp|I_4do2ie&D3efviaZ2Stm_p+;tcMhL$CUei-e>D1(
zv1!|}Up{2teQ@~t$ivdllZU5|42C}|Cz-!&-}2!Py>|P%K6CC3WA&A1OPNg*qt`I2
zuf72eEDwKn-w$7h*Y4UldOwg)eR}bolaFqF{P`zK@e>E!GcP|Kzwd#aGvC<oi!Yyf
z(E8@r?qHa~E7()R(R0hcelDAiZX4FY6Sw|0dDW?-8_)mq{1@JP;>K-P4}N>*OJAL0
zzJB^f=5Muwcl>$f-G@K==+mXl{>N_k!RZ6X4&U;~1atO#h2lGY@|L@^r%Um{*=s-b
z(yjLu)StP-1C`G`vwGX{eTN?Ol<ilp<iGpm$(J5E`@%!3=hBM@CzuDG`Q6?Z@BIDp
z<YT9|uKcl<KmNi8uKL!Q)qx!=13S)ceNANUJ!byn^3`WI`!7Bj-?b<A_|Dl+{2Oil
BeIEb-

literal 0
HcmV?d00001


From ba7e36464ae0010880a5351acf8a46851519b585 Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Mon, 29 Apr 2024 23:02:57 +0300
Subject: [PATCH 12/13] Goblin speech bubble, water/space cleaner spray
 reaction (#1309)

* Goblin speech bubble

* Update goblin.yml

* Update Goblin.xml

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 .../_NF/Entities/Mobs/Species/goblin.yml      |  22 ++++++++++++++
 Resources/Prototypes/_NF/typing_indicator.yml |   5 ++++
 .../ServerInfo/Guidebook/Mobs/Goblin.xml      |   6 ++--
 .../_NF/Effects/speech.rsi/goblin0.png        | Bin 0 -> 6932 bytes
 .../_NF/Effects/speech.rsi/goblin1.png        | Bin 0 -> 5909 bytes
 .../_NF/Effects/speech.rsi/goblin2.png        | Bin 0 -> 5863 bytes
 .../Textures/_NF/Effects/speech.rsi/meta.json |  28 ++++++++++++++++++
 7 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/typing_indicator.yml
 create mode 100644 Resources/Textures/_NF/Effects/speech.rsi/goblin0.png
 create mode 100644 Resources/Textures/_NF/Effects/speech.rsi/goblin1.png
 create mode 100644 Resources/Textures/_NF/Effects/speech.rsi/goblin2.png
 create mode 100644 Resources/Textures/_NF/Effects/speech.rsi/meta.json

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
index 055a5e6f1d0..6745e1e03d5 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
@@ -31,6 +31,7 @@
     damage:
       types:
         Slash: 3
+#        Poison: 1 # Too Stinky
   - type: Speech
     speechSounds: Alto
   - type: DamageOnHighSpeedImpact
@@ -60,6 +61,27 @@
 #    tallDensity: 185
   - type: ReplacementAccent
     accent: goblin_accent
+  - type: TypingIndicator
+    proto: goblin
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      60: 0.85  # 0.7 is base speed.
+      80: 0.75  # 0.5 is base speed.
+  - type: Reactive
+    groups:
+      Flammable: [ Touch ]
+      Extinguish: [ Touch ]
+    reactions:
+    - reagents: [ Water, SpaceCleaner, SoapReagent ]
+      methods: [ Touch ]
+      effects:
+      - !type:WashCreamPieReaction
+    - reagents: [ Water, SpaceCleaner, SoapReagent ]
+      methods: [ Touch ]
+      effects:
+      - !type:Emote
+        emote: Scream
+        probability: 0.2
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/_NF/typing_indicator.yml b/Resources/Prototypes/_NF/typing_indicator.yml
new file mode 100644
index 00000000000..1faa4df1f4d
--- /dev/null
+++ b/Resources/Prototypes/_NF/typing_indicator.yml
@@ -0,0 +1,5 @@
+- type: typingIndicator
+  id: goblin
+  spritePath: /Textures/_NF/Effects/speech.rsi
+  typingState: goblin0
+  offset: 0, 0.2
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Goblin.xml b/Resources/ServerInfo/Guidebook/Mobs/Goblin.xml
index 7ab352a80e2..3221645512f 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/Goblin.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/Goblin.xml
@@ -7,10 +7,10 @@
 
   They can [color=#ffa500]only[/color] eat meat and fruits, but can eat raw meat and drink blood without any ill effects.
 
-  Their small stature allows goblins to dive into toilets and mailing units.
+  Their small stature allows goblins to dive into toilets and mailing units. They don't like to be sprayed with water or space cleaner.
   
-  Their unarmed attacks deal Slash damage instead of Blunt.
+  Their unarmed attacks deal [color=red]Slash[/color] damage instead of Blunt.
 
-  Due to their unusual dietary choices goblins take [color=green]20% less Toxin damage[/color], but because of their small size they take [color=#ffa500]10% more Brute (Blunt/Slash/Piercing) damage[/color].
+  Due to their unusual dietary choices goblins take [color=lime]20% less Toxin damage[/color], but because of their small size they take [color=#ffa500]10% more Brute (Blunt/Slash/Piercing) damage[/color].
 
 </Document>
diff --git a/Resources/Textures/_NF/Effects/speech.rsi/goblin0.png b/Resources/Textures/_NF/Effects/speech.rsi/goblin0.png
new file mode 100644
index 0000000000000000000000000000000000000000..59399c7d7ca7f8b7f7b15e1f857384f609f985ec
GIT binary patch
literal 6932
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
XWQ0E%!vA?fU?J_cG|t}jbLjs7?9L1C

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Effects/speech.rsi/goblin1.png b/Resources/Textures/_NF/Effects/speech.rsi/goblin1.png
new file mode 100644
index 0000000000000000000000000000000000000000..a55b767808df68dc45ec282e875d7f5c56ce39f5
GIT binary patch
literal 5909
zcmeHKdt6L;8=ulml2nx2HYVa#bHCJ#NtY=VM(JV`(Ok|nM>BJ#GiRD9i|*vIibQQo
z5{ea)EtlMKZ$(Ne+HwscS$3n1_naxoyI%YHeBS*}(_GH;`##_2`F(%S^ZT8X7BJgq
zsOe}^91b_s&(|vu{l;T&6C?Cf6&Lpshcl4I1&1Pm0u5dXLlRI1;E`A*fCsdo1c%c$
zJ)Jv0#%Yq-pOGWx>06qdg3q+)KEYS{d$>usKU=lEd3%;J$aAP?;SA(xXT#Roo`ln5
z8@+3CXUzC!Vpix4ym)!$k@+v8%Z@&OZF1K+PU99)sQ*T3R`n{veOPvNG~0Pw)LY=8
z<puo3y9td&`=D2^7#Ch&zxv1{PZZg5#c<cQle>I6ZOdx62bUaYhe2)Cox%6dyBXb|
zkjBVg`y?bNA-B=To7)W|EYi*Nv3eCF8oF{WJx}w=YpsD>E35XurP{u^4p07m*darY
za5*<mFH@<vB}--hn})Jg^xMjsN%tMkbHEZ%xjp9QvfJm06<2vr>sIjIQ8J&s9s1Lz
zE%&_bp2@q``n*0scUxlJw5l#B)>B=*rETnzlGP)vs&lJ(;XaL)4)r7URyb{&@>YMI
zhFIA61C%#gbA0^vDMl%_w*IT?E=sT6Si0TF#(vn`m%ps7tOp|Il<PtIdI973^#Pv4
zMlqzVGvafgMbeJ>zsIblX<G)<vm@4w+*kZ~i*ZX)huP)BaO#D&sdJyNw%LCBoTuW@
zW<z)B7OG*sV#VfX?rxh5Ww^wW%G_x8-(FGXq<nMBbV%FAp2X2T8O;SfjCczHlt8zR
zkN3Auwu}Yl63$Qu*(J64a*FSb&M?tvFH(~Yl<9^y#zbZQzF_3Ex^h>&<Ya5>tC<lv
z$LV@Y84_djQ7@RQd@VORc{`<)(wrvp+efp8jt*fIEw0bc;(b34zLcXPHJWZ}Rq|(g
zOv_p@gIc-Ms4De(>L|&^sKNs?_#sinJHiGn4U=69tj(Ga)*m)*$hhFDetLM5BFU(b
zaVI?^^?UB6{eyR3rrgcU-dWA9Djjpk>UvpW1>uh?g*9oTp}a)icIU+bdlouK!zYzc
z1_{RwUfJ%6OMZ}&eZ|_Id~Zt0x!V;<KUt)1DmnS6)M8L#v_)0Hn4`w9-JJ)*w-ax5
zjbNAMb&tDn*sysB+!5W4J9K=Zk=*|0gIAyCy@`KWnVhlq;NFJ9=%<;=A)e_65Te^^
z`er^@U#}f{E9_v~@`LZr1jJ9har{M${^O#>wUOzz28QCjzohNIJw4YXvF?#@oJ*X=
znaF!v9OB!#%$MsIC;cc@ua2%h4H67i=G2!L>@F%hQZQ@wIoUV|&~fn(-Y=TsR)EO<
z!GG?N-&oc7*p0old#GMhw9*HEGHY#!ouvJ!IQ0C*qy;?_!16`6=~p;D9qmuk&rAK5
zWbbIL-Ip4?r))ZFPyAlqlOe{jEk_r*TwPNVTk6l;aJhH~drr8Wh>#a$aAv{C<3Guh
z*LFOS-`%6HRli8JDKly1<L31osdNu0v(15TijVvDI97Bwq_w*5&vu+{7t|S%zr^P(
z-Kboz{!%=yD`lj@GJy7Q{f30>^3%%t+f1MD($egmJj2FJBN;7p%s;oX`3-*i<gTTM
zH1E`>j9p6(tQs?=r38NU?5NQ)vmV<w)R&@%%S9$o+QM5cHnOf$>(3&OaX7sckjD$~
z<MH0_Ip|K4yEJ2}Z>9U#b0?-15Qye67Ix{|)Ft>ScP588C8k`PE4_Z|-ZdKr=o`3T
ztYJf9(z>&|lU5%rHZM-Zcj2OAlz~Ww<-1MRVP~|;TkATWb(eRWKWFWkMg7w%K0hap
zGu#G#9Wws8soV77rz!aadZ}1K9n#RL9yV-Ihmc#<b8D;p1RFCWt-&4k&PNWNMxDRx
zEQ<bhlKH`s$yQsf*0m!ZcYKOxnxBX!H9onYEpYu|%OrEFAv;J}M>cO%r)YCr2#!<k
zFHxCS<(9cPUgt!$Y&by)4fvL}U>7^lAS>O=RDVL<9FGwW!qVLZw!XE?Zk=@#cL&{D
ze<4KA{=EL;0DRN3=Wboid*|flAnOyO^V-gqOv`tVu#qyI+PiO*giVU?7*!rP^=+8d
z=AH=^H8lhu_jfF1baPFCYb$JQ``tCK@Y0EPeCUA5v8^@E_Y)H4=Rubr?X6f>YmA>6
zPHe#$uQ(Z+R?-muYxB+Kn<pZhdU|lXIPkG^z+5&CH!K%K4}nnrERG10lLTT&2#~aL
zC3;BUa9lU7QXq-~5WEnG1Qo7?j-w|Ccu?$0_?F41@RdA33i`&uKv3N5U{PF@h%F|#
zO*7?cIVgb~Km>TLT&7TQw5|jlF9-dNnaKpa4uV9v5<>X_cpd};cm|0<q7c2cU<{2g
z%@ogt#S%`S*YrLL^vabWMGz&2Ox9>LBn_Pe!I5Mto6ROuXk;3Vh$4upSOp@`5)~?Y
zjG~vr3s8w*P>Fz$0*`SDgpe9>B@obYd>=VFD)QE%#=Zd9wT@neh{=BF1p}QA3Lw)c
z6c-|eMx?RH1O3raKEK~vq3Tl+)sw6hD9Kb3g)EnU<e@^mV?M<Dq=zaPJ&VbKfC^H>
zBEUNaP$2dLgDPce)xel)6@Zy^dCSBSGMbbw@<1OSKYl>J4<=(IC|Bw{F!VsASk#YG
zs$rQ9BNmYX86Za!QK8J#kMIa6`LIAA%?BI#OCo5ve*TZp@AcB<qSKY*1&P#HP(LqM
z0+ugF42eK7NB5Hfh}l#Y-I)kbnN%V}M4=L0SQH^qNE5SM#6kuIU{eNA`6*P0Kp_G!
zDwLcAqC7$rMx#>!B9qNRDFBg#$QD!SL>7(dEOB87sdO510EIscqMaa+4a^Fo5~EZi
zvA~(ZWIGcjLMnsE5VHWHkWF<aQUoFvi%N45v0dmoDr_A%9sz!?1RAL~Kb<8&CO{+*
zEJxc5REQys>H|0!lmkJC0F#aCOl2^rbUKsa%%U)<)DNJ!0IWjG9Al+YNHm&mL@eS=
zM>z#(xq)&)BtTXwB6S1U!f?>(pwbGk?m(G!c62rz9t;Q&2o8oInJWRy4UbXknhMYD
zYZuNeNThSrfdMhraeY1KDTpNNF1h5-f&ao3B!x7J|BdGZw4cQTMl=u{<q!J{7Xu>X
z^E{sd_cH~eyPXPwWBvYSQvZSD_7<!!>I=cK1L6k((Y;r_TapaaNrlJjwgHYn)GNPA
z5Ce#HOMvRwJ0y|{6p;YB-}W`zdpr1vLS{;60x`oGAc~j*I+4K^F^K}23ytXFj1~)>
zDrB++y|vcQu7V_pMgRjIk!TH|>x?#+Zk_Ry`|9ssA7`VH0$6cTXbd8Sfo_7qGzy2w
z<S-e8-qpr)$=DA2ezsg}590GV1NGoydlbhHE5snRQYixg_+y>k*Uf*y4e;-)(Z6#a
z2<!FcLCRRPi=~LaM)BG3p8)nU%mPJ#LIr&;^?{IHSq2<LXwJPh^ngRpOLG5#*;gf4
zBmIMaebx65MnI{*2Kgd=zsmJht}jyHi@;y2>#JN}q`((}zgE}(O)k?9kKBL)z3<bY
z57cvFc+1g;aU<bOA1~Z$>{YltlZjdeD}Cpwa5$1Z_SVzxaEn2W#)u!^+xVfuxZ%z$
zd+@;|)HDk54n=s79D9nw_1&%GH6S9zW4HF-CYalxpsRjf9>JlNPcz4xpQc!+z9V%x
zFs&wRY#tGl0Gs;mw^bSp(l<Lrt<-BBS>e8Kf9x5tKQ2)=K0E_TJa&cAQ+sb|Z0tV$
z;q^_N>RgrKN{i@D?iJ&8O+QcEU{Q4EkE%-CN#RteaH2zzQnk?8F5}X7GXv7kCIp(|
zl+7UzlsBE5ms;!Xur94n5Bxp5esrc~(s-vT%fK1Q7H?{o__LDd9aH?eB-ui_;72oc
zr-$)E|2pBS{F^41Ud=Q`EOC_iVQVIKZm8RLfnrvP{VzX1rXVU<LR<6ZDmpiupZ9F9
JV$X=ge*;n9#>4;s

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Effects/speech.rsi/goblin2.png b/Resources/Textures/_NF/Effects/speech.rsi/goblin2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5320d891dbc41ff6cdc0ea8adc49df30f3b0d536
GIT binary patch
literal 5863
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
P4Uhyuv-uSPu}l9AvO2t!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Effects/speech.rsi/meta.json b/Resources/Textures/_NF/Effects/speech.rsi/meta.json
new file mode 100644
index 00000000000..bfff36ab804
--- /dev/null
+++ b/Resources/Textures/_NF/Effects/speech.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Goblin speech bubble by ErhardSteinhauer",
+    "states": [
+        {
+            "name": "goblin0",
+            "delays": [
+                [
+                    0.2,
+                    0.3,
+                    0.3,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "goblin1"
+        },
+        {
+            "name": "goblin2"
+        }
+    ]
+}

From f63889ab1bffb0866d1d41d4ed0244b111448fe5 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 29 Apr 2024 20:03:22 +0000
Subject: [PATCH 13/13] Automatic Changelog (#1309)

---
 Resources/Changelog/Changelog.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 9c5f75daffd..c1620ff13c5 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4399,3 +4399,13 @@ Entries:
         NFSD, as long as they are alive, for NFSD coins.
   id: 4961
   time: '2024-04-29T17:48:22.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added goblin speech bubble.
+    - type: Tweak
+      message: Added to goblins low tolerance for cleanliness.
+    - type: Tweak
+      message: Goblins are less affected by slowdown from wounds.
+  id: 4962
+  time: '2024-04-29T20:02:58.0000000+00:00'