{
text.AppendLine(fiber);
}
+ text.AppendLine();
+ text.AppendLine(Loc.GetString("forensic-scanner-interface-dnas"));
+ foreach (var dna in msg.DNAs)
+ {
+ text.AppendLine(dna);
+ }
Diagnostics.Text = text.ToString();
}
}
},
new Label()
{
- Text = Loc.GetString("general-station-record-console-record-fingerprint", ("fingerprint", record.Fingerprint is null ? Loc.GetString("generic-not-available-shorthand") : record.Fingerprint))
+ Text = Loc.GetString("general-station-record-console-record-fingerprint", ("fingerprint", record.Fingerprint ?? Loc.GetString("generic-not-available-shorthand")))
+ },
+ new Label()
+ {
+ Text = Loc.GetString("general-station-record-console-record-dna", ("dna", record.DNA ?? Loc.GetString("generic-not-available-shorthand")))
}
};
using Content.Server.Chemistry.EntitySystems;
using Content.Server.Chemistry.ReactionEffects;
using Content.Server.Fluids.EntitySystems;
+using Content.Server.Forensics;
using Content.Server.HealthExaminable;
using Content.Server.Popups;
using Content.Shared.Chemistry.Components;
// Pass some of the chemstream into the spilled blood.
var temp = component.ChemicalSolution.SplitSolution(component.BloodTemporarySolution.Volume / 10);
component.BloodTemporarySolution.AddSolution(temp, _prototypeManager);
- _spillableSystem.SpillAt(uid, component.BloodTemporarySolution, "PuddleBlood", false);
+ var puddle = _spillableSystem.SpillAt(uid, component.BloodTemporarySolution, "PuddleBlood", false);
+ if (puddle != null)
+ {
+ var comp = EnsureComp<ForensicsComponent>(puddle.Owner); //TODO: Get rid of .Owner
+ if (TryComp<DnaComponent>(uid, out var dna))
+ comp.DNAs.Add(dna.DNA);
+ }
+
component.BloodTemporarySolution.RemoveAllSolution();
}
component.BloodTemporarySolution.RemoveAllSolution();
tempSol.AddSolution(component.ChemicalSolution, _prototypeManager);
component.ChemicalSolution.RemoveAllSolution();
- _spillableSystem.SpillAt(uid, tempSol, "PuddleBlood", true);
+ var puddle = _spillableSystem.SpillAt(uid, tempSol, "PuddleBlood", true);
+
+ if (puddle != null)
+ {
+ var comp = EnsureComp<ForensicsComponent>(puddle.Owner); //TODO: Get rid of .Owner
+ if (TryComp<DnaComponent>(uid, out var dna))
+ comp.DNAs.Add(dna.DNA);
+ }
}
}
+using Content.Server.Forensics;
using Content.Server.Stack;
using Content.Shared.Prototypes;
using Content.Shared.Stacks;
using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
namespace Content.Server.Destructible.Thresholds.Behaviors
[DataField("offset")]
public float Offset { get; set; } = 0.5f;
+ [DataField("transferForensics")]
+ public bool DoTransferForensics = false;
+
public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
{
var position = system.EntityManager.GetComponent<TransformComponent>(owner).MapPosition;
{
var spawned = system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
system.StackSystem.SetCount(spawned, count);
+
+ TransferForensics(spawned, system, owner);
}
else
{
for (var i = 0; i < count; i++)
{
- system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
+ var spawned = system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
+
+ TransferForensics(spawned, system, owner);
}
}
}
}
+
+ public void TransferForensics(EntityUid spawned, DestructibleSystem system, EntityUid owner)
+ {
+ if (!DoTransferForensics ||
+ !system.EntityManager.TryGetComponent<ForensicsComponent>(owner, out var forensicsComponent))
+ return;
+
+ var comp = system.EntityManager.EnsureComponent<ForensicsComponent>(spawned);
+ comp.DNAs = forensicsComponent.DNAs;
+
+ if (!system.Random.Prob(0.4f))
+ return;
+ comp.Fingerprints = forensicsComponent.Fingerprints;
+ comp.Fibers = forensicsComponent.Fibers;
+ }
}
}
--- /dev/null
+namespace Content.Server.Forensics;
+
+/// <summary>
+/// This component is for mobs that have DNA.
+/// </summary>
+[RegisterComponent]
+public sealed class DnaComponent : Component
+{
+ [DataField("dna"), ViewVariables(VVAccess.ReadWrite)]
+ public string DNA = String.Empty;
+}
[ViewVariables(VVAccess.ReadOnly)]
public List<string> Fibers = new();
+ /// <summary>
+ /// DNA that the forensic scanner found from the <see cref="DNAComponent"/> on an entity.
+ /// </summary>
+ [ViewVariables(VVAccess.ReadOnly)]
+ public List<string> DNAs = new();
+
/// <summary>
/// What is the name of the entity that was scanned last?
/// </summary>
[DataField("fibers")]
public HashSet<string> Fibers = new();
+
+ [DataField("dnas")]
+ public HashSet<string> DNAs = new();
}
}
var state = new ForensicScannerBoundUserInterfaceState(
component.Fingerprints,
component.Fibers,
+ component.DNAs,
component.LastScannedName,
component.PrintCooldown,
component.PrintReadyAt);
{
scanner.Fingerprints = new();
scanner.Fibers = new();
+ scanner.DNAs = new();
}
else
{
scanner.Fingerprints = forensics.Fingerprints.ToList();
scanner.Fibers = forensics.Fibers.ToList();
+ scanner.DNAs = forensics.DNAs.ToList();
}
scanner.LastScannedName = MetaData(args.Args.Target.Value).EntityName;
{
text.AppendLine(fiber);
}
+ text.AppendLine();
+ text.AppendLine(Loc.GetString("forensic-scanner-interface-dnas"));
+ foreach (var dna in component.DNAs)
+ {
+ text.AppendLine(dna);
+ }
_paperSystem.SetContent(printed, text.ToString());
_audioSystem.PlayPvs(component.SoundPrint, uid,
component.Fingerprints = new();
component.Fibers = new();
+ component.DNAs = new();
component.LastScannedName = string.Empty;
UpdateUserInterface(uid, component);
public override void Initialize()
{
SubscribeLocalEvent<FingerprintComponent, ContactInteractionEvent>(OnInteract);
- SubscribeLocalEvent<FingerprintComponent, ComponentInit>(OnInit);
+ SubscribeLocalEvent<FingerprintComponent, ComponentInit>(OnFingeprintInit);
+ SubscribeLocalEvent<DnaComponent, ComponentInit>(OnDNAInit);
}
private void OnInteract(EntityUid uid, FingerprintComponent component, ContactInteractionEvent args)
ApplyEvidence(uid, args.Other);
}
- private void OnInit(EntityUid uid, FingerprintComponent component, ComponentInit args)
+ private void OnFingeprintInit(EntityUid uid, FingerprintComponent component, ComponentInit args)
{
component.Fingerprint = GenerateFingerprint();
}
+ private void OnDNAInit(EntityUid uid, DnaComponent component, ComponentInit args)
+ {
+ component.DNA = GenerateDNA();
+ }
+
private string GenerateFingerprint()
{
byte[] fingerprint = new byte[16];
return Convert.ToHexString(fingerprint);
}
+ private string GenerateDNA()
+ {
+ var letters = new List<string> { "A", "C", "G", "T" };
+ string DNA = String.Empty;
+
+ for (int i = 0; i < 16; i++)
+ {
+ DNA += letters[_random.Next(letters.Count)];
+ }
+
+ return DNA;
+ }
+
private void ApplyEvidence(EntityUid user, EntityUid target)
{
var component = EnsureComp<ForensicsComponent>(target);
using Content.Server.Body.Systems;
using Content.Server.Chemistry.EntitySystems;
using Content.Server.Fluids.Components;
+using Content.Server.Forensics;
using Content.Server.Nutrition.Components;
using Content.Server.Nutrition.EntitySystems;
using Content.Server.Popups;
var puddle = EntityManager.SpawnEntity("PuddleVomit", Transform(uid).Coordinates);
+ var forensics = EnsureComp<ForensicsComponent>(puddle);
+ if (TryComp<DnaComponent>(uid, out var dna))
+ forensics.DNAs.Add(dna.DNA);
+
var puddleComp = Comp<PuddleComponent>(puddle);
SoundSystem.Play("/Audio/Effects/Fluids/splat.ogg", Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.2f).WithVolume(-4f));
using Content.Server.Chemistry.EntitySystems;
using Content.Server.DoAfter;
using Content.Server.Fluids.EntitySystems;
+using Content.Server.Forensics;
using Content.Server.Nutrition.Components;
using Content.Server.Popups;
using Content.Shared.Administration.Logs;
component.ForceDrink = false;
args.Handled = true;
+
+ var comp = EnsureComp<ForensicsComponent>(uid);
+ if (TryComp<DnaComponent>(args.Args.Target, out var dna))
+ comp.DNAs.Add(dna.DNA);
}
private void AddDrinkVerb(EntityUid uid, DrinkComponent component, GetVerbsEvent<AlternativeVerb> ev)
}
TryComp<FingerprintComponent>(player, out var fingerprintComponent);
+ TryComp<DnaComponent>(player, out var dnaComponent);
- CreateGeneralRecord(station, idUid.Value, profile.Name, profile.Age, profile.Species, profile.Gender, jobId, fingerprintComponent?.Fingerprint, profile, records);
+ CreateGeneralRecord(station, idUid.Value, profile.Name, profile.Age, profile.Species, profile.Gender, jobId, fingerprintComponent?.Fingerprint, dnaComponent?.DNA, profile, records);
}
/// this call will cause an exception. Ensure that a general record starts out with a job
/// that is currently a valid job prototype.
/// </param>
+ /// <param name="mobFingerprint">Fingerprint of the character.</param>
+ /// <param name="dna">DNA of the character.</param>
+ ///
/// <param name="profile">
/// Profile for the related player. This is so that other systems can get further information
/// about the player character.
/// Optional - other systems should anticipate this.
/// </param>
/// <param name="records">Station records component.</param>
- public void CreateGeneralRecord(EntityUid station, EntityUid? idUid, string name, int age, string species, Gender gender, string jobId, string? mobFingerprint, HumanoidCharacterProfile? profile = null,
+ public void CreateGeneralRecord(EntityUid station, EntityUid? idUid, string name, int age, string species, Gender gender, string jobId, string? mobFingerprint, string? dna, HumanoidCharacterProfile? profile = null,
StationRecordsComponent? records = null)
{
if (!Resolve(station, ref records))
Species = species,
Gender = gender,
DisplayPriority = jobPrototype.Weight,
- Fingerprint = mobFingerprint
+ Fingerprint = mobFingerprint,
+ DNA = dna
};
var key = AddRecord(station, records);
{
public readonly List<string> Fingerprints = new();
public readonly List<string> Fibers = new();
+ public readonly List<string> DNAs = new();
public readonly string LastScannedName = string.Empty;
public readonly TimeSpan PrintCooldown = TimeSpan.Zero;
public readonly TimeSpan PrintReadyAt = TimeSpan.Zero;
public ForensicScannerBoundUserInterfaceState(
List<string> fingerprints,
List<string> fibers,
+ List<string> dnas,
string lastScannedName,
TimeSpan printCooldown,
TimeSpan printReadyAt)
{
Fingerprints = fingerprints;
Fibers = fibers;
+ DNAs = dnas;
LastScannedName = lastScannedName;
PrintCooldown = printCooldown;
PrintReadyAt = printReadyAt;
/// </summary>
[ViewVariables]
public string? Fingerprint;
+
+ /// <summary>
+ /// DNA of the person.
+ /// </summary>
+ [ViewVariables]
+ public string? DNA;
}
forensic-scanner-interface-title = Forensic scanner
forensic-scanner-interface-fingerprints = Fingerprints
forensic-scanner-interface-fibers = Fibers
+forensic-scanner-interface-dnas = DNAs
forensic-scanner-interface-no-data = No scan data available
forensic-scanner-interface-print = Print
forensic-scanner-interface-clear = Clear
guide-entry-artifact-reports = Artifact Reports
guide-entry-traversal-distorter = Traversal Distorter
guide-entry-machine-upgrading = Machine Upgrading
+
+guide-entry-security = Security
+guide-entry-dna = DNA
general-station-record-console-record-species = Species: {$species}
general-station-record-console-record-gender = Gender: {$gender}
general-station-record-console-record-fingerprint = Fingerprint: {$fingerprint}
+general-station-record-console-record-dna = DNA: {$dna}
proper: true
- type: StandingState
- type: Fingerprint
+ - type: Dna
- type: MobPrice
price: 1500 # Kidnapping a living person and selling them for cred is a good move.
deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less.
ShardGlass:
min: 1
max: 1
+ transferForensics: true
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: DamageOnLand
BrokenBottle:
min: 1
max: 1
+ transferForensics: true
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Tag
ShardGlass:
min: 1
max: 1
+ transferForensics: true
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: DamageOnLand
--- /dev/null
+- type: guideEntry
+ id: Security
+ name: guide-entry-security
+ text: "/Server Info/Guidebook/Security/Security.xml"
+ children:
+ - DNA
+
+- type: guideEntry
+ id: DNA
+ name: guide-entry-dna
+ text: "/Server Info/Guidebook/Security/DNA.xml"
- Botany
- Engineering
- Science
+ - Security
- type: guideEntry
id: Survival
--- /dev/null
+<Document>
+ # DNA
+
+ ## How to get someone’s DNA?
+
+ You can scan blood puddles, vomit, glasses, bottles, cans and other liquid containers using the [color=#a4885c]forensic scanner[/color] to get DNA of any person.
+ <Box>
+ <GuideEntityEmbed Entity="ForensicScanner"/>
+ </Box>
+ So be careful before fighting with someone.
+
+ ## I got DNA. How do I recognize whose it is?
+
+ You can print the forensic information of the object you scanned so you never miss it. Now with the paper containing DNA you can simply find a [color=#a4885c]Station Records Computer[/color] and look for a person whose DNA matches.
+ <Box>
+ <GuideEntityEmbed Entity="ComputerStationRecords"/>
+ </Box>
+</Document>
--- /dev/null
+<Document>
+
+</Document>
projects / space-station-14.git / commitdiff