Merge branch 'master' into Hunter

new-frontiers-14 · Oct 20, 2024 · dfa86c1 · dfa86c1
2 parents 651ae4f + 33511ae
commit dfa86c1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -756,15 +756,15 @@ private string SanitizeInGameICMessage(EntityUid source, string message, out str
         var newMessage = message.Trim();
         newMessage = SanitizeMessageReplaceWords(newMessage);
 
+        _sanitizer.TrySanitizeOutSmilies(newMessage, source, out newMessage, out emoteStr); // Frontier: moved up from bottom of function
+
         if (capitalize)
             newMessage = SanitizeMessageCapital(newMessage);
         if (capitalizeTheWordI)
             newMessage = SanitizeMessageCapitalizeTheWordI(newMessage, "i");
         if (punctuate)
             newMessage = SanitizeMessagePeriod(newMessage);
 
-        _sanitizer.TrySanitizeOutSmilies(newMessage, source, out newMessage, out emoteStr);
-
         return newMessage;
     }
 

diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs
@@ -74,6 +74,8 @@ private void SolidEmpty(EntityUid uid, SolidFuelGeneratorAdapterComponent compon
         else
         {
             int materialAmount = _materialStorage.GetMaterialAmount(uid, component.FuelMaterial);
+            if (materialAmount <= 0) // No fuel?  Job done.
+                return;
             _materialStorage.TryChangeMaterialAmount(uid, component.FuelMaterial, -materialAmount);
 
             var ejectedUid = Spawn(component.EjectedFuelProtoId, Transform(uid).Coordinates);

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -4789,3 +4789,17 @@ Entries:
         properly.
   id: 5435
   time: '2024-10-19T16:04:02.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: >-
+        Solid fuel generators now no longer spawn fuel when ejecting while
+        empty.
+  id: 5436
+  time: '2024-10-20T05:27:54.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: Chatsan emotes ending in letters now work again.
+  id: 5437
+  time: '2024-10-20T13:45:51.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/spectre.yml b/Resources/Maps/_NF/Shuttles/spectre.yml
@@ -2106,14 +2106,6 @@ entities:
     - type: Transform
       pos: -9.5,0.5
       parent: 3
-- proto: BaseAdvancedPen
-  entities:
-  - uid: 1032
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.2843938,24.057287
-      parent: 3
 - proto: Bed
   entities:
   - uid: 876
@@ -6036,6 +6028,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.7531438,23.885412
       parent: 3
+- proto: PenCap
+  entities:
+  - uid: 1032
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.2843938,24.057287
+      parent: 3
 - proto: PortableScrubber
   entities:
   - uid: 77

diff --git a/Resources/Prototypes/_NF/Shipyard/spectre.yml b/Resources/Prototypes/_NF/Shipyard/spectre.yml
@@ -12,7 +12,7 @@
   id: Spectre
   name: NR Spectre
   description: A large, attractive but dated vessel with a pure focus on research and development. It is capable of generating anomalies.
-  price: 185000
+  price: 185000 # Anomaly spawner
   category: Large
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/spectre.yml