Merge stable into master (#38058)

This commit is contained in:
SlamBamActionman
2025-06-04 11:35:43 +02:00
committed by GitHub
3 changed files with 5 additions and 5 deletions

View File

@@ -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);
}
}

View File

@@ -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>

View File

@@ -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.