cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-09-29 23:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nubody (2/3) - ShitMed removal (#5844)

Browse Source 
* Reapply "Nubody Merge" (#5807)

This reverts commit d62f7cef10.

* Revert "Nubody Merge (#5670)"

This reverts commit b465cfb3fd.

* Revert "IPC fibers (#4968)"

This reverts commit c2b42211f0.

* Revert "IPC Polymorph fix (#4545)"

This reverts commit fa03d8c655.

* Revert "fix IPC not having humanoid emotes (#4445)"

This reverts commit 216fdf999f.

* Revert "ipc heat/cold (#4306)"

This reverts commit fafd5cf816.

* Revert "ipc cables (#4283)"

This reverts commit 54958039a1.

* Revert "feat: ipcs now have dynamic power draw based off movement speed (#3917)"

This reverts commit 71e8b7e64b.

* Revert "fix ipcs not being able to disarm (#3374)"

This reverts commit 764c4dcf54.

* Revert "make steel heal caustic for ipcs (#3206)"

This reverts commit 450ac82550.

* Revert "add missing ipc survival boxes (#3065)"

This reverts commit 888c9cdb00.

* Revert "make borgs use ipc repairing (#3064)"

This reverts commit f77a49dd0b.

* Revert "Update hud.yml to add ipcs to diagnostic hud (#3019)"

This reverts commit 7220643531.

* Revert "Tweak IPCs (#2979)"

This reverts commit 98b47476de.

* Revert "fix nukies ipc test fail (#2957)"

This reverts commit 4a1acbf863.

* Revert "fix ipc nukies not getting comms (#2884)"

This reverts commit 8a2254770e.

* Revert "fix ipc encryption key mispredict (#2879)"

This reverts commit f08726efc1.

* Revert "Merge pull request #2800 from Spielern/port-ipc"

This reverts commit 822fa4312c, reversing
changes made to fe4c23c702.

* Remove and Fix rest of IPC Hangons causing crashes

* Integration test Errors

* Expand migration file with removed IPC stuff

* IPC Leg was found and migrated to naught

* Revert "Merge pull request #2542 from deltanedas/shitmed-ops"

This reverts commit 83a8002922, reversing
changes made to baa89b0052.

* Revert "Set up surgical augments infrastructure & add tool panel augments (#3059)"

This reverts commit a40f0be6fd.

* Revert "Psionic Prosthetics (#4689)"

This reverts commit 2679bb238a.

* Revert "Add surgical cleanliness and sanitation (#2847)"

This reverts commit 64565ba4f7.

* Remove unremoved mentions

* Revert "Add autoclave to easily sanitize large amounts of items and faster (#2933)"

This reverts commit d0da90fa2e.

* Shit Med Removed

* Remove _ShitMed Folders and fix Errors in Console

* Add OrganAnimalBrain into the mirgraiton file

* Heads no Input Mover

* Monke

* Full migration file I guess

* oops

* shiv state fix

* Restore accidental deleted recipe

* Forgot one flt mention

* Fix more issues

* Comment out Damage Visual for motorkind for now

* Motorkind...

* Commenting stuff out for now

* thought there'd be more of this to gut

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
This commit is contained in:
Coryn
2026-05-21 20:27:04 -04:00
committed by GitHub
co-authored by Janet Blackquill
parent 3e33391980
commit cb62b27fcf
1045 changed files with 1099 additions and 20557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Server/Medical/HealthAnalyzerSystem.cs
+13 -69
View File
@@ -20,12 +20,6 @@ using Robust.Shared.Containers;
using Robust.Shared.Timing;
using Content.Server.Body.Systems;
// Shitmed Change
using Content.Shared.Body.Part;
using Content.Shared.Body.Systems;
using Content.Shared._Shitmed.Targeting;
using System.Linq;
// Begin DeltaV
using Content.Server._DV.MedicalRecords;
using Content.Shared._DV.MedicalRecords;
@@ -39,7 +33,6 @@ public sealed class HealthAnalyzerSystem : EntitySystem
[Dependency] private readonly PowerCellSystem _cell = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly SharedBodySystem _bodySystem = default!; // Shitmed Change
[Dependency] private readonly ItemToggleSystem _toggle = default!;
[Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
@@ -55,14 +48,13 @@ public sealed class HealthAnalyzerSystem : EntitySystem
SubscribeLocalEvent<HealthAnalyzerComponent, EntGotInsertedIntoContainerMessage>(OnInsertedIntoContainer);
SubscribeLocalEvent<HealthAnalyzerComponent, ItemToggledEvent>(OnToggled);
SubscribeLocalEvent<HealthAnalyzerComponent, DroppedEvent>(OnDropped);
// Shitmed Change Start
// Begin DeltaV - Medical Records
Subs.BuiEvents<HealthAnalyzerComponent>(HealthAnalyzerUiKey.Key, subs =>
{
subs.Event<HealthAnalyzerPartMessage>(OnHealthAnalyzerPartSelected);
subs.Event<HealthAnalyzerTriageStatusMessage>(OnHealthAnalyzerTriageStatusSelected);
subs.Event<HealthAnalyzerTriageClaimMessage>(OnHealthAnalyzerTriageClaimSelected);
});
// Shitmed Change End
// End DeltaV - Medical Records
}
public override void Update(float frameTime)
@@ -83,17 +75,6 @@ public sealed class HealthAnalyzerSystem : EntitySystem
continue;
}
// Shitmed Change Start
if (component.CurrentBodyPart != null
&& (Deleted(component.CurrentBodyPart)
|| TryComp(component.CurrentBodyPart, out BodyPartComponent? bodyPartComponent)
&& bodyPartComponent.Body is null))
{
BeginAnalyzingEntity((uid, component), patient, null);
continue;
}
// Shitmed Change End
component.NextUpdate = _timing.CurTime + component.UpdateInterval;
//Get distance between health analyzer and the scanned entity
@@ -102,12 +83,12 @@ public sealed class HealthAnalyzerSystem : EntitySystem
if (component.MaxScanRange != null && !_transformSystem.InRange(patientCoordinates, transform.Coordinates, component.MaxScanRange.Value))
{
//Range too far, disable updates
PauseAnalyzingEntity((uid, component), patient, component.CurrentBodyPart); // DeltaV - Analyzer Reactivation
PauseAnalyzingEntity((uid, component), patient); // DeltaV - Analyzer Reactivation
continue;
}
component.IsAnalyzerActive = true; // DeltaV - Analyzer Reactivation
UpdateScannedUser(uid, patient, true, component.CurrentBodyPart); // Shitmed Change
UpdateScannedUser(uid, patient, true);
}
}
@@ -188,16 +169,14 @@ public sealed class HealthAnalyzerSystem : EntitySystem
/// </summary>
/// <param name="healthAnalyzer">The health analyzer that should receive the updates</param>
/// <param name="target">The entity to start analyzing</param>
/// <param name="part">Shitmed Change: The body part to analyze, if any</param>
public void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target, EntityUid? part = null) // Mono - make public
public void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target) // Mono - make public
{
//Link the health analyzer to the scanned entity
healthAnalyzer.Comp.ScannedEntity = target;
healthAnalyzer.Comp.CurrentBodyPart = part; // Shitmed Change
_toggle.TryActivate(healthAnalyzer.Owner);
UpdateScannedUser(healthAnalyzer, target, true, part); // Shitmed Change
UpdateScannedUser(healthAnalyzer, target, true);
}
/// <summary>
@@ -209,7 +188,7 @@ public sealed class HealthAnalyzerSystem : EntitySystem
{
//Unlink the analyzer
healthAnalyzer.Comp.ScannedEntity = null;
healthAnalyzer.Comp.CurrentBodyPart = null; // Shitmed Change
_toggle.TryDeactivate(healthAnalyzer.Owner);
UpdateScannedUser(healthAnalyzer, target, false);
@@ -220,39 +199,15 @@ public sealed class HealthAnalyzerSystem : EntitySystem
/// </summary>
/// <param name="healthAnalyzer">The health analyzer that's receiving the updates</param>
/// <param name="target">The entity to analyze</param>
private void PauseAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target, EntityUid? part = null)
private void PauseAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target)
{
if (!healthAnalyzer.Comp.IsAnalyzerActive)
return;
UpdateScannedUser(healthAnalyzer, target, false, part);
UpdateScannedUser(healthAnalyzer, target, false);
healthAnalyzer.Comp.IsAnalyzerActive = false;
}
// Shitmed Change Start
/// <summary>
/// Shitmed Change: Handle the selection of a body part on the health analyzer
/// </summary>
/// <param name="healthAnalyzer">The health analyzer that's receiving the updates</param>
/// <param name="args">The message containing the selected part</param>
private void OnHealthAnalyzerPartSelected(Entity<HealthAnalyzerComponent> healthAnalyzer, ref HealthAnalyzerPartMessage args)
{
if (!TryGetEntity(args.Owner, out var owner))
return;
if (args.BodyPart == null)
{
BeginAnalyzingEntity(healthAnalyzer, owner.Value, null);
}
else
{
var (targetType, targetSymmetry) = _bodySystem.ConvertTargetBodyPart(args.BodyPart.Value);
if (_bodySystem.GetBodyChildrenOfType(owner.Value, targetType, symmetry: targetSymmetry) is { } part)
BeginAnalyzingEntity(healthAnalyzer, owner.Value, part.FirstOrDefault().Id);
}
}
// Shitmed Change End
// Begin DeltaV - Medical Records
private void OnHealthAnalyzerTriageStatusSelected(Entity<HealthAnalyzerComponent> healthAnalyzer, ref HealthAnalyzerTriageStatusMessage args)
{
@@ -277,14 +232,13 @@ public sealed class HealthAnalyzerSystem : EntitySystem
/// <param name="healthAnalyzer">The health analyzer</param>
/// <param name="target">The entity being scanned</param>
/// <param name="scanMode">True makes the UI show ACTIVE, False makes the UI show INACTIVE</param>
/// <param name="part">Shitmed Change: The body part being scanned, if any</param>
public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool scanMode, EntityUid? part = null)
public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool scanMode)
{
if (!_uiSystem.HasUi(healthAnalyzer, HealthAnalyzerUiKey.Key)
|| !HasComp<DamageableComponent>(target))
return;
var uiState = GetHealthAnalyzerUiState(target, part); // Shitmed Change
var uiState = GetHealthAnalyzerUiState(target);
uiState.ScanMode = scanMode;
_uiSystem.ServerSendUiMessage(
@@ -298,9 +252,8 @@ public sealed class HealthAnalyzerSystem : EntitySystem
/// Creates a HealthAnalyzerState based on the current state of an entity.
/// </summary>
/// <param name="target">The entity being scanned</param>
/// <param name="part">Shitmed Change: The body part being scanned, if any</param>
/// <returns></returns>
public HealthAnalyzerUiState GetHealthAnalyzerUiState(EntityUid? target, EntityUid? part = null)
public HealthAnalyzerUiState GetHealthAnalyzerUiState(EntityUid? target)
{
if (!target.HasValue || !HasComp<DamageableComponent>(target))
return new HealthAnalyzerUiState();
@@ -326,12 +279,6 @@ public sealed class HealthAnalyzerSystem : EntitySystem
if (TryComp<UnrevivableComponent>(entity, out var unrevivableComp) && unrevivableComp.Analyzable)
unrevivable = true;
// Shitmed Change Start
Dictionary<TargetBodyPart, TargetIntegrity>? body = null;
if (HasComp<TargetingComponent>(target))
body = _bodySystem.GetBodyPartStatus(entity);
// Shitmed Change End
return new HealthAnalyzerUiState(
GetNetEntity(entity),
bodyTemperature,
@@ -339,10 +286,7 @@ public sealed class HealthAnalyzerSystem : EntitySystem
null,
bleeding,
unrevivable,
// Shitmed Change
body,
_medicalRecords.GetMedicalRecords(entity), // DeltaV - Medical Records
part != null ? GetNetEntity(part) : null
_medicalRecords.GetMedicalRecords(entity) // DeltaV - Medical Records
);
}
}