Merge branch '20240409-DungeonLootSpawners' of https://github.com/Erh…

…ardSteinhauer/frontier-station-14 into pr/1219
new-frontiers-14 · Apr 29, 2024 · 142239e · 142239e
2 parents 40025de + 0f25fb2
commit 142239e
Show file tree

Hide file tree

Showing 35 changed files with 972 additions and 2,002 deletions.
diff --git 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; // Frontier - PR #1292 1.5f<1.15f
 
         [DataField("thrusterIgnoreEmp")]
         public bool ThrusterIgnoreEmp = false;

diff --git 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;
             }

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4367,3 +4367,45 @@ 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'
+- 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'
+- author: Kesiath
+  changes:
+    - type: Tweak
+      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'
+- 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'