Make mobs without hands unable to spill jugs (#31438)
* make mobs without hands unable to spill jugs * snails
This commit is contained in:
@@ -1,12 +0,0 @@
|
|||||||
using Robust.Shared.GameStates;
|
|
||||||
|
|
||||||
namespace Content.Shared.Fluids.Components;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Blocks this entity's ability to spill solution containing entities via the verb menu.
|
|
||||||
/// </summary>
|
|
||||||
[RegisterComponent, NetworkedComponent]
|
|
||||||
public sealed partial class PreventSpillerComponent : Component
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -34,7 +34,7 @@ public abstract partial class SharedPuddleSystem
|
|||||||
|
|
||||||
private void AddSpillVerb(Entity<SpillableComponent> entity, ref GetVerbsEvent<Verb> args)
|
private void AddSpillVerb(Entity<SpillableComponent> entity, ref GetVerbsEvent<Verb> args)
|
||||||
{
|
{
|
||||||
if (!args.CanAccess || !args.CanInteract)
|
if (!args.CanAccess || !args.CanInteract || args.Hands == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!_solutionContainerSystem.TryGetSolution(args.Target, entity.Comp.SolutionName, out var soln, out var solution))
|
if (!_solutionContainerSystem.TryGetSolution(args.Target, entity.Comp.SolutionName, out var soln, out var solution))
|
||||||
@@ -46,10 +46,6 @@ public abstract partial class SharedPuddleSystem
|
|||||||
if (solution.Volume == FixedPoint2.Zero)
|
if (solution.Volume == FixedPoint2.Zero)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (HasComp<PreventSpillerComponent>(args.User))
|
|
||||||
return;
|
|
||||||
|
|
||||||
|
|
||||||
Verb verb = new()
|
Verb verb = new()
|
||||||
{
|
{
|
||||||
Text = Loc.GetString("spill-target-verb-get-data-text")
|
Text = Loc.GetString("spill-target-verb-get-data-text")
|
||||||
|
|||||||
@@ -1719,7 +1719,6 @@
|
|||||||
price: 50
|
price: 50
|
||||||
- type: BadFood
|
- type: BadFood
|
||||||
- type: NonSpreaderZombie
|
- type: NonSpreaderZombie
|
||||||
- type: PreventSpiller
|
|
||||||
- type: FireVisuals
|
- type: FireVisuals
|
||||||
sprite: Mobs/Effects/onfire.rsi
|
sprite: Mobs/Effects/onfire.rsi
|
||||||
normalState: Mouse_burning
|
normalState: Mouse_burning
|
||||||
|
|||||||
@@ -484,7 +484,6 @@
|
|||||||
price: 50
|
price: 50
|
||||||
- type: BadFood
|
- type: BadFood
|
||||||
- type: NonSpreaderZombie
|
- type: NonSpreaderZombie
|
||||||
- type: PreventSpiller
|
|
||||||
- type: FireVisuals
|
- type: FireVisuals
|
||||||
sprite: Mobs/Effects/onfire.rsi
|
sprite: Mobs/Effects/onfire.rsi
|
||||||
normalState: Mouse_burning
|
normalState: Mouse_burning
|
||||||
|
|||||||
Reference in New Issue
Block a user