From 9b03e8347bb216f6e7183e0b829fe1a958dfb862 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Date: Sun, 1 Jun 2025 00:06:34 -0700
Subject: [PATCH 1/2] [HOTFIX] Salvage Job Computer Eating your Jobs (#37997)

One line fix
---
 Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs b/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs
index 993227e822..587fa9c4f3 100644
--- a/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs
+++ b/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs
@@ -55,7 +55,7 @@ public sealed class SalvageJobBoardSystem : EntitySystem
         foreach (var sold in args.Sold)
         {
             if (!FulfillsSalvageJob(sold, (args.Station, salvageJobsData), out var jobId))
-                return;
+                continue;
             TryCompleteSalvageJob((args.Station, salvageJobsData), jobId.Value);
         }
     }

From 7567f17a461e2535c39170e9861dbc96ff8cb15e Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Wed, 4 Jun 2025 11:08:42 +0200
Subject: [PATCH 2/2] Change "Terrorism" to "Station-Wide Destruction" in Space
 Law (#37362)

* crime is bad

* Add atmos description

* Update SpaceLaw.xml
---
 .../Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml          | 6 +++---
 .../ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
index b6ae2c3a28..c6d29bfba9 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
@@ -141,7 +141,7 @@
     </ColorBox>
     <ColorBox Color="#453a59">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Terrorism (D)
+        Station-Wide Destruction (D)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -867,7 +867,7 @@
     </ColorBox>
     <ColorBox>
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Terrorism
+        Station-Wide Destruction
       </Box>
     </ColorBox>
     <ColorBox>
@@ -877,7 +877,7 @@
     </ColorBox>
     <ColorBox>
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Summed up; extreme sabotage of station systems or setting off self-destruction systems.
+        Summed up; extreme sabotage of station systems or setting off self-destruction systems. This includes any means causing the entire station to become uninhabitable, such as through station-wide atmospherics sabotage.
       </Box>
     </ColorBox>
     <ColorBox>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
index 5360d0b344..5e07f3cd3a 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
@@ -46,7 +46,7 @@
 
   [color=#a4885c]Repeater Offenders:[/color] Repeated crimes are when someone is released for a crime and then goes to commit the same crime within the same shift. Repeated crimes can be charged with tacked-on time; first repeat: 3:00, second repeat: 6:00, third repeat: permanent confinement. It should be noted each tacked-on time is directly linked to one type of crime, so for example, if someone does their first repeat of trespass and petty theft, you can charge them with an extra 6 minutes.
 
-  [color=#a4885c]Accessory, Attempting, And Intention:[/color] If someone intentionally, knowingly and substantially assists someone in enacting a crime they can be charged with the relevant crimes, such as an engineer giving someone tools, who says they are going to break into an area. Same goes for a clear and solid attempt at a crime, or a person who shows clear intent to act out a crime, such as a syndicate nuclear operative arming a nuke but getting arrested before it goes off, they can still be charged with terrorism. Does not apply to crimes that have an attempted listing already, like attempted murder.
+  [color=#a4885c]Accessory, Attempting, And Intention:[/color] If someone intentionally, knowingly and substantially assists someone in enacting a crime they can be charged with the relevant crimes, such as an engineer giving someone tools, who says they are going to break into an area. Same goes for a clear and solid attempt at a crime, or a person who shows clear intent to act out a crime, such as a syndicate nuclear operative arming a nuke but getting arrested before it goes off, they can still be charged with station-wide destruction. Does not apply to crimes that have an attempted listing already, like attempted murder.
 
   ## Normal Punishments
   - [color=#a4885c]Warning:[/color] For minor crimes, fix the issue, then warn the person not to attempt the crime again. If they still proceed to do it at a later date, a brig time may be better.