Skip to content

Commit

Permalink
bogos binted
Browse files Browse the repository at this point in the history
  • Loading branch information
Lyndomen committed Nov 13, 2024
1 parent 2e59beb commit a85a7a6
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,20 @@ private void AssignRandomTarget(EntityUid uid, ObjectiveAssignedEvent args, Pred

_target.SetTarget(uid, _random.Pick(selectedHumans), target);
}

// DeltaV - start making people only die once from EE
private float GetProgress(EntityUid target, bool requireDead)
{
// deleted or gibbed or something, counts as dead
if (!TryComp<MindComponent>(target, out var mind) || mind.OwnedEntity == null)
{ //DeltaV Port from EE
if (!requireDead && !_wasKilled.Contains(target)) _wasKilled.Add(target); //DeltaV Port from EE
{
if (!requireDead && !_wasKilled.Contains(target)) _wasKilled.Add(target);
return 1f;
}

// dead is success
if (_mind.IsCharacterDeadIc(mind))
{
if (!requireDead && !_wasKilled.Contains(target)) _wasKilled.Add(target); //DeltaV Port from EE
if (!requireDead && !_wasKilled.Contains(target)) _wasKilled.Add(target);
return 1f;
}

Expand Down Expand Up @@ -132,6 +132,7 @@ private float GetProgress(EntityUid target, bool requireDead)
// // if evac is still here and target hasn't boarded, show 50% to give you an indicator that you are doing good
// return _emergencyShuttle.EmergencyShuttleArrived ? 0.5f : 0f;
// Clear the wasKilled list on round end
private void OnRoundEnd(RoundEndedEvent ev) //DeltaV port from EE
=> _wasKilled.Clear(); //DeltaV port from EE
private void OnRoundEnd(RoundEndedEvent ev)
=> _wasKilled.Clear();
// DeltaV - end making people only die once from EE
}

0 comments on commit a85a7a6

Please sign in to comment.