fix: mops with liquid can hit people again (#38486)

This commit is contained in:
Perry Fraser
2025-06-21 18:23:39 -04:00
committed by GitHub
parent ef55c3db06
commit 793f525c6b
3 changed files with 12 additions and 1 deletions

View File

@@ -69,7 +69,8 @@ public sealed partial class PuddleSystem
if (totalSplit == 0)
return;
args.Handled = true;
// Optionally allow further melee handling occur
args.Handled = entity.Comp.PreventMelee;
// First update the hit count so anything that is not reactive wont count towards the total!
foreach (var hit in args.HitEntities)

View File

@@ -28,4 +28,12 @@ public sealed partial class SpillableComponent : Component
/// </summary>
[DataField]
public bool SpillWhenThrown = true;
/// <summary>
/// If true, melee processing will stop if any reagent is transferred.
/// Otherwise, melee processing keeps occuring allowing both reagent
/// transfer and melee damage to happen.
/// </summary>
[DataField]
public bool PreventMelee = true;
}

View File

@@ -26,6 +26,7 @@
- type: Spillable
solution: absorbed
spillWhenThrown: false
preventMelee: false
- type: DrainableSolution
solution: absorbed
- type: Wieldable
@@ -84,6 +85,7 @@
- type: Spillable
solution: absorbed
spillWhenThrown: false
preventMelee: false
- type: DrainableSolution
solution: absorbed
- type: Wieldable