cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-10-01 00:27:59 +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.Shared/Damage/Systems/DamageableSystem.API.cs
+9 -69
View File
@@ -4,10 +4,6 @@ using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Robust.Shared.Prototypes;
using Content.Shared.Body.Systems; // Shitmed Change
using Content.Shared._Shitmed.Targeting; // Shitmed Change
using Robust.Shared.Random; // Shitmed Change
namespace Content.Shared.Damage.Systems;
public sealed partial class DamageableSystem
@@ -74,21 +70,12 @@ public sealed partial class DamageableSystem
bool ignoreResistances = false,
bool interruptsDoAfters = true,
EntityUid? origin = null,
bool ignoreGlobalModifiers = false,
// Shitmed Changes
bool canSever = true,
bool canEvade = false,
float partMultiplier = 0.5f,
TargetBodyPart? targetPart = null,
bool doPartDamage = true,
bool onlyDamageParts = false
// END Shitmed Changes
bool ignoreGlobalModifiers = false
)
{
//! Empty just checks if the DamageSpecifier is _literally_ empty, as in, is internal dictionary of damage types is empty.
// If you deal 0.0 of some damage type, Empty will be false!
return TryChangeDamage(ent, damage, out _, ignoreResistances, interruptsDoAfters, origin, ignoreGlobalModifiers,
canSever: canSever, canEvade: canEvade, partMultiplier: partMultiplier, targetPart: targetPart, doPartDamage: doPartDamage, onlyDamageParts: onlyDamageParts); // Shitmed
return TryChangeDamage(ent, damage, out _, ignoreResistances, interruptsDoAfters, origin, ignoreGlobalModifiers);
}
/// <summary>
@@ -109,21 +96,12 @@ public sealed partial class DamageableSystem
bool ignoreResistances = false,
bool interruptsDoAfters = true,
EntityUid? origin = null,
bool ignoreGlobalModifiers = false,
// Shitmed Changes
bool canSever = true,
bool canEvade = false,
float partMultiplier = 0.5f,
TargetBodyPart? targetPart = null,
bool doPartDamage = true,
bool onlyDamageParts = false
// END Shitmed Changes
bool ignoreGlobalModifiers = false
)
{
//! Empty just checks if the DamageSpecifier is _literally_ empty, as in, is internal dictionary of damage types is empty.
// If you deal 0.0 of some damage type, Empty will be false!
newDamage = ChangeDamage(ent, damage, ignoreResistances, interruptsDoAfters, origin, ignoreGlobalModifiers,
canSever: canSever, canEvade: canEvade, partMultiplier: partMultiplier, targetPart: targetPart, doPartDamage: doPartDamage, onlyDamageParts: onlyDamageParts); // Shitmed
newDamage = ChangeDamage(ent, damage, ignoreResistances, interruptsDoAfters, origin, ignoreGlobalModifiers);
return !newDamage.Empty;
}
@@ -144,15 +122,7 @@ public sealed partial class DamageableSystem
bool ignoreResistances = false,
bool interruptsDoAfters = true,
EntityUid? origin = null,
bool ignoreGlobalModifiers = false,
// Shitmed Changes
bool canSever = true,
bool canEvade = false,
float partMultiplier = 0.5f,
TargetBodyPart? targetPart = null,
bool doPartDamage = true,
bool onlyDamageParts = false // DeltaV - Fix EvenHealing on Limbs && Standardize PartDamage.
// END Shitmed Changes
bool ignoreGlobalModifiers = false
)
{
var damageDone = new DamageSpecifier();
@@ -163,25 +133,12 @@ public sealed partial class DamageableSystem
if (damage.Empty)
return damageDone;
damage = ApplyUniversalAllModifiers(damage); // DeltaV - Fix EvenHealing with Limbs
var before = new BeforeDamageChangedEvent(damage, origin);
RaiseLocalEvent(ent, ref before);
if (before.Cancelled)
return damageDone;
// Shitmed - Do Part Damage
if (doPartDamage) // DeltaV - Fix EvenHealing with Limbs.
{
var partDamage = new BeforePartDamageChangedEvent(damage, origin, targetPart, ignoreResistances, canSever, canEvade, partMultiplier); // DeltaV - Standardize PartDamage.
RaiseLocalEvent(ent.Owner, ref partDamage);
if (partDamage.Evaded || partDamage.Cancelled)
return damageDone;
}
// END Shitmed
// Apply resistances
if (!ignoreResistances)
{
@@ -193,7 +150,7 @@ public sealed partial class DamageableSystem
// TODO DAMAGE
// byref struct event.
var ev = new DamageModifyEvent(damage, origin, targetPart: targetPart); // Shitmed - Add TargetPart
var ev = new DamageModifyEvent(damage, origin);
RaiseLocalEvent(ent, ev);
damage = ev.Damage;
@@ -201,9 +158,6 @@ public sealed partial class DamageableSystem
return damageDone;
}
if (onlyDamageParts) // DeltaV - Fix EvenHealing with Limbs.
return damageDone;
if (!ignoreGlobalModifiers)
damage = ApplyUniversalAllModifiers(damage);
@@ -226,7 +180,7 @@ public sealed partial class DamageableSystem
}
if (!damageDone.Empty)
OnEntityDamageChanged((ent, ent.Comp), damageDone, interruptsDoAfters, origin, canSever); // Shitmed
OnEntityDamageChanged((ent, ent.Comp), damageDone, interruptsDoAfters, origin);
return damageDone;
}
@@ -244,13 +198,7 @@ public sealed partial class DamageableSystem
Entity<DamageableComponent?> ent,
FixedPoint2 amount,
ProtoId<DamageGroupPrototype>? group = null,
EntityUid? origin = null,
// Begin DeltaV additions - Adapt to shitmed changes
TargetBodyPart? targetPart = null,
bool doPartDamage = true,
bool onlyDamageParts = false // Fix EvenHealing on Limbs && Standardize PartDamage.
// End DeltaV additions - Adapt to shitmed changes
)
EntityUid? origin = null)
{
var damageChange = new DamageSpecifier();
@@ -305,7 +253,7 @@ public sealed partial class DamageableSystem
}
}
return ChangeDamage(ent, damageChange, true, false, origin, targetPart: targetPart, doPartDamage: doPartDamage, onlyDamageParts: onlyDamageParts); // DeltaV - Adapt to shitmed
return ChangeDamage(ent, damageChange, true, false, origin);
}
/// <summary>
@@ -470,14 +418,6 @@ public sealed partial class DamageableSystem
// Setting damage does not count as 'dealing' damage, even if it is set to a larger value, so we pass an
// empty damage delta.
OnEntityDamageChanged((ent, ent.Comp), new DamageSpecifier());
// Shitmed Change Start
if (HasComp<TargetingComponent>(ent.Owner))
{
foreach (var (part, _) in _body.GetBodyChildren(ent.Owner))
SetAllDamage(part, newValue);
}
// Shitmed Change End
}
/// <summary>