Make mobs without hands unable to spill jugs (#31438)

* make mobs without hands unable to spill jugs

* snails
This commit is contained in:
slarticodefast 2024-09-09 13:02:15 +02:00 committed by deltanedas
parent 8eaf35a9d4
commit 9cb75c9ff9
4 changed files with 2 additions and 20 deletions

View File

@ -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
{
}

View File

@ -34,7 +34,7 @@ public abstract partial class SharedPuddleSystem
private void AddSpillVerb(Entity<SpillableComponent> entity, ref GetVerbsEvent<Verb> args)
{
if (!args.CanAccess || !args.CanInteract)
if (!args.CanAccess || !args.CanInteract || args.Hands == null)
return;
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)
return;
if (HasComp<PreventSpillerComponent>(args.User))
return;
Verb verb = new()
{
Text = Loc.GetString("spill-target-verb-get-data-text")

View File

@ -1707,7 +1707,6 @@
- type: FelinidFood # Nyanotrasen - Felinid, ability to eat mice, see Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
- type: BadFood
- type: NonSpreaderZombie
- type: PreventSpiller
- type: FireVisuals
sprite: Mobs/Effects/onfire.rsi
normalState: Mouse_burning

View File

@ -484,7 +484,6 @@
price: 50
- type: BadFood
- type: NonSpreaderZombie
- type: PreventSpiller
- type: FireVisuals
sprite: Mobs/Effects/onfire.rsi
normalState: Mouse_burning
@ -506,7 +505,7 @@
visualType: Large
messages: [ "snail-hurt-by-salt-popup" ]
probability: 0.66
- type: entity
parent: MobSnail
id: MobSnailInstantDeath