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

* make mobs without hands unable to spill jugs * snails
TheShuEd · Sep 9, 2024 · 2187aef · 2187aef
1 parent 82464da
commit 2187aef
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 20 deletions.
diff --git a/Content.Shared/Fluids/Components/PreventSpillerComponent.cs b/Content.Shared/Fluids/Components/PreventSpillerComponent.cs
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
@@ -34,7 +34,7 @@ private void OnExamined(Entity<SpillableComponent> entity, ref ExaminedEvent arg
 
     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 @@ private void AddSpillVerb(Entity<SpillableComponent> entity, ref GetVerbsEvent<V
         if (solution.Volume == FixedPoint2.Zero)
             return;
 
-        if (HasComp<PreventSpillerComponent>(args.User))
-            return;
-
-
         Verb verb = new()
         {
             Text = Loc.GetString("spill-target-verb-get-data-text")

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1719,7 +1719,6 @@
     price: 50
   - type: BadFood
   - type: NonSpreaderZombie
-  - type: PreventSpiller
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -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