Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make fugitives anonymous #1817

Merged
merged 4 commits into from
Oct 2, 2024
Merged

make fugitives anonymous #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20e69f5
make fugitives anonymous
Sep 12, 2024
5a63447
merge master
Sep 24, 2024
0da4adc
add either dna or prints to the report
Sep 24, 2024
c02612a
:trollface:
Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions Content.Server/DeltaV/StationEvents/Events/FugitiveRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Content.Server.Antag;
using Content.Server.Communications;
using Content.Server.Forensics;
using Content.Server.StationEvents.Components;
using Content.Shared.GameTicking.Components;
using Content.Shared.Ghost;
Expand Down Expand Up @@ -105,9 +106,9 @@ private Entity<PaperComponent> SpawnReport(FugitiveRuleComponent rule, Transform
private FormattedMessage GenerateReport(EntityUid uid, FugitiveRuleComponent rule)
{
var report = new FormattedMessage();
report.PushMarkup(Loc.GetString("fugitive-report-title", ("name", uid)));
report.PushMarkup(Loc.GetString("fugitive-report-title"));
report.PushNewline();
report.PushMarkup(Loc.GetString("fugitive-report-first-line", ("name", uid)));
report.PushMarkup(Loc.GetString("fugitive-report-first-line"));
report.PushNewline();

if (!TryComp<HumanoidAppearanceComponent>(uid, out var humanoid))
Expand All @@ -125,6 +126,13 @@ private FormattedMessage GenerateReport(EntityUid uid, FugitiveRuleComponent rul
if (TryComp<PhysicsComponent>(uid, out var physics))
report.PushMarkup(Loc.GetString("fugitive-report-weight", ("weight", Math.Round(physics.FixturesMass))));

// add a random identifying quality that officers can use to track them down
report.PushMarkup(RobustRandom.Next(0, 2) switch
{
0 => Loc.GetString("fugitive-report-detail-dna", ("dna", GetDNA(uid))),
_ => Loc.GetString("fugitive-report-detail-prints", ("prints", GetPrints(uid)))
});

report.PushNewline();
report.PushMarkup(Loc.GetString("fugitive-report-crimes-header"));

Expand All @@ -139,6 +147,16 @@ private FormattedMessage GenerateReport(EntityUid uid, FugitiveRuleComponent rul
return report;
}

private string GetDNA(EntityUid uid)
{
return CompOrNull<DnaComponent>(uid)?.DNA ?? "?";
}

private string GetPrints(EntityUid uid)
{
return CompOrNull<FingerprintComponent>(uid)?.Fingerprint ?? "?";
}

private void AddCharges(FormattedMessage report, FugitiveRuleComponent rule)
{
var crimeTypes = PrototypeManager.Index(rule.CrimesDataset);
Expand Down
9 changes: 7 additions & 2 deletions Resources/Locale/en-US/deltav/game-ticking/game-rules/rule-fugitive.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ fugitive-spawn = You fall from the ceiling!
station-event-fugitive-hunt-announcement = Please check communications consoles for a sensitive message.
fugitive-announcement-GALPOL = GALPOL

fugitive-report-title = WANTED: {$name}
fugitive-report-first-line = Escaped fugitive {$name} has been spotted in the sector. They may be a stowaway on a station somewhere.
fugitive-report-title = WANTED FUGITIVE!
fugitive-report-first-line = An escaped fugitive has been spotted in the sector and disguised their identity. They may be a stowaway on a station somewhere.
fugitive-report-inhuman = {CAPITALIZE(THE($name))} {CONJUGATE-BE($name)} inhuman. We have no further details.
fugitive-report-morphotype = MORPHOTYPE: {$species}
fugitive-report-age = AGE: {$age}
Expand All @@ -16,6 +16,11 @@ fugitive-report-sex = SEX: {$sex ->
*[none] N/A
}
fugitive-report-weight = WEIGHT: {$weight} kg

# Random details
fugitive-report-detail-dna = DNA: {$dna}
fugitive-report-detail-prints = FINGERPRINT: {$prints}

fugitive-report-crimes-header = The above individual is wanted across the sector for the following:
fugitive-report-crime = - {$count ->
[1] One count
Expand Down
Loading