tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix various IC states not counting as dead (#19049)

Browse Source
This commit is contained in:
Nemanja
2023-08-13 23:34:18 -04:00
committed by GitHub
parent 494a8cd6b4
commit 6a125b55df
5 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Objectives/Conditions/KillPersonCondition.cs
View File

@@ -24,15 +24,12 @@ namespace Content.Server.Objectives.Conditions
{
get
{
var targetName = string.Empty;
var targetName = Target?.CharacterName ?? "Unknown";
var jobName = Target?.CurrentJob?.Name ?? "Unknown";
if (Target == null)
return Loc.GetString("objective-condition-kill-person-title", ("targetName", targetName), ("job", jobName));
if (Target.OwnedEntity is {Valid: true} owned)
targetName = EntityManager.GetComponent<MetaDataComponent>(owned).EntityName;
return Loc.GetString("objective-condition-kill-person-title", ("targetName", targetName), ("job", jobName));
}
}