Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] Surgery Hotfix: Head and Limbs dissapears #932

Merged
merged 9 commits into from
Nov 23, 2024
Merged

[Fix] Surgery Hotfix: Head and Limbs dissapears #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6539d88
fix dissapearing head and limbs
TokenStyle Nov 22, 2024
eff3dc9
revert hotfix for normal fix
TokenStyle Nov 22, 2024
c2d19a1
Fix limbs being gibbable and let head drop brain, eyes etc
TokenStyle Nov 22, 2024
586245a
cannot fix without more health workaround
TokenStyle Nov 22, 2024
500359d
proper limb fix when destroyed on body to drop organs
TokenStyle Nov 23, 2024
0bdb683
easier to cut off limbs
TokenStyle Nov 23, 2024
e7aa14b
remove unnesseccery edits
TokenStyle Nov 23, 2024
88e8890
easier to cutt off limbs2
TokenStyle Nov 23, 2024
a6d335a
remove unnecessery edits
TokenStyle Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Content.Shared/Body/Part/BodyPartComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
/// to make possible severing it.
/// </summary>
[DataField, AutoNetworkedField]
public float SeverIntegrity = 90;
public float SeverIntegrity = 80;

/// <summary>
/// On what TargetIntegrity we should re-enable the part.
Expand All @@ -124,11 +124,11 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
[DataField, AutoNetworkedField]
public Dictionary<TargetIntegrity, float> IntegrityThresholds = new()
{
{ TargetIntegrity.CriticallyWounded, 90 },
{ TargetIntegrity.HeavilyWounded, 75 },
{ TargetIntegrity.ModeratelyWounded, 60 },
{ TargetIntegrity.SomewhatWounded, 40},
{ TargetIntegrity.LightlyWounded, 20 },
{ TargetIntegrity.CriticallyWounded, 70 },
{ TargetIntegrity.HeavilyWounded, 60 },
{ TargetIntegrity.ModeratelyWounded, 45 },
{ TargetIntegrity.SomewhatWounded, 30},
{ TargetIntegrity.LightlyWounded, 15 },
{ TargetIntegrity.Healthy, 10 },
};

Expand Down
22 changes: 11 additions & 11 deletions Content.Shared/Body/Systems/SharedBodySystem.Body.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,19 +396,19 @@ public virtual HashSet<EntityUid> GibPart(

RemovePartChildren((partId, part), bodyEnt);

_gibbingSystem.TryGibEntityWithRef(partId,
partId,
GibType.Gib,
GibContentsOption.Drop,
ref gibs,
playAudio: true,
launchGibs: true,
launchDirection: splatDirection,
launchImpulse: GibletLaunchImpulse * splatModifier,
launchImpulseVariance: GibletLaunchImpulseVariance,
launchCone: splatCone);
// We have to iterate though every organ to drop it when part is being destroyed
foreach (var organ in GetPartOrgans(partId, part))
{
_gibbingSystem.TryGibEntityWithRef(bodyEnt, organ.Id, GibType.Drop, GibContentsOption.Skip,
ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse * splatModifier,
launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
}
}

_gibbingSystem.TryGibEntityWithRef(partId, partId, GibType.Gib, GibContentsOption.Drop, ref gibs,
playAudio: true, launchGibs: true, launchDirection: splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);

if (HasComp<InventoryComponent>(partId))
{
foreach (var item in _inventory.GetHandOrInventoryEntities((partId)))
Expand Down
Loading