Offbrand medical (#3366)
* Offbrand medical * what if we regrade * zombies are mostly there thats it thats a wrap xd * here's changeling * some bonus gut punches * start working on the guidebook * fix rsi and yaml lints * my agrichem so fits * we stay rejuvenated * my china so laked * debrute * fix suicide * fix the suicide tests * my surgery so requires laying down * the guidebook continues * READ KEB PAGES * keb vascular recoupler * read keb medicine * fix yaml lint * fix the EntityRemoveConstructionGraphStep * fix overlay init * scalpels are not a food tool * return of the programmer art * my line so nieuw * boxes deserve veins too * mrrrp yaml * what if we redid brain damage alerts * bloot pressure * kill mannitol drowsiness * get licensed * my read so me * get feedbacked nerd * fine-tune the heart stoppage conditions * cryostasis adjustments, guidebook adjustments, fix negative strain issues * my surgery so table * fix heart surgery and guidebook * medicine & defibrillator pass * iv bags and stands * prefills * janet gets very sidetracked * mostly finished iv stuff * what if we fixed the guidebook * halve decapoid cryostasis * my medicines so IV * finetune cryostasis * less logspam * metabolism-aware iv stands and cryopods * give people painkillers * yaml lint real * fix blood build * finish rebase * tidy up localization * clean up my yaml beasties... * soft curve after exceeding maximum damage * husks/bonedeaths Grabbag of Offmed fixes & improvements (#3461) * CPR moment * Mob AI fix * Fix brain oxygenation not updating on regeneration * sorry gamers you cannot resist the pull * Troll combat abilities more in softcrit praying rn (#3467) dont have CPR be 50% (#3468) Make offbrand murder easier to contend with (#3473) * e * disrupt people in softcrit when attacking them * ok gamers we're gaming * forgor Hopefully final pass before Offbrand merge (#3475) First pass of Offbrand adjustments (#3477) Swap blood pressure values in health analyzer (#3476) Systolic over diastolic Co-authored-by: Kip <32859367+kipdotnet@users.noreply.github.com> Offbrand pass 2: Mostly bugfixes (#3480) Fix zeds causing PVS reloads (#3482) Offbrand pass 3: I hate surgery I hate surgery I hate surgery I (#3481) * set up surgery ui * test fail real Pain/braingasps (#3487) Offmed bundle 5 - the evil one (#3489) * Evil cavity surgery * les borgues * nicotine moment * epinephrine RNG * legalese * test fail real * ok jamers cope with c4 Pass 6
This commit is contained in:
committed by
Janet Blackquill
parent
398c8df343
commit
8894eca118
@@ -30,6 +30,7 @@ using Robust.Shared.Prototypes;
|
||||
using Robust.Shared.Utility;
|
||||
using Content.Shared.Atmos.Components;
|
||||
using System.Linq;
|
||||
using Content.Shared._Offbrand.Wounds; // Offbrand
|
||||
|
||||
namespace Content.Server.NPC.Systems;
|
||||
|
||||
@@ -54,6 +55,7 @@ public sealed class NPCUtilitySystem : EntitySystem
|
||||
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
|
||||
[Dependency] private readonly MobThresholdSystem _thresholdSystem = default!;
|
||||
[Dependency] private readonly TurretTargetSettingsSystem _turretTargetSettings = default!;
|
||||
[Dependency] private readonly HealthRankingSystem _healthRanking = default!; // Offbrand
|
||||
|
||||
private EntityQuery<PuddleComponent> _puddleQuery;
|
||||
private EntityQuery<TransformComponent> _xformQuery;
|
||||
@@ -304,6 +306,8 @@ public sealed class NPCUtilitySystem : EntitySystem
|
||||
{
|
||||
if (!TryComp(targetUid, out DamageableComponent? damage))
|
||||
return 0f;
|
||||
if (_healthRanking.RankHealth(targetUid, con.TargetState) is { } ranking) // Offbrand
|
||||
return ranking; // Offbrand
|
||||
if (con.TargetState != MobState.Invalid && _thresholdSystem.TryGetPercentageForState(targetUid, con.TargetState, damage.TotalDamage, out var percentage))
|
||||
return Math.Clamp((float)(1 - percentage), 0f, 1f);
|
||||
if (_thresholdSystem.TryGetIncapPercentage(targetUid, damage.TotalDamage, out var incapPercentage))
|
||||
@@ -335,11 +339,11 @@ public sealed class NPCUtilitySystem : EntitySystem
|
||||
}
|
||||
case TargetIsAliveCon:
|
||||
{
|
||||
return _mobState.IsAlive(targetUid) ? 1f : 0f;
|
||||
return _mobState.IsAlive(targetUid) && !_healthRanking.IsCritical(targetUid) ? 1f : 0f; // Offbrand
|
||||
}
|
||||
case TargetIsCritCon:
|
||||
{
|
||||
return _mobState.IsCritical(targetUid) ? 1f : 0f;
|
||||
return _healthRanking.IsCritical(targetUid) ? 1f : 0f; // Offbrand
|
||||
}
|
||||
case TargetIsDeadCon:
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user