Merge branch 'master' into chemmaster-sorting

Simple-Station · Dec 5, 2024 · 1566021 · 1566021
2 parents ee04296 + 1b15668
commit 1566021
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 28 deletions.
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
@@ -7,6 +7,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
+using Content.Shared.Silicon.Components;
 using Content.Shared.Silicons.Bots;
 using Robust.Shared.Audio.Systems;
 
@@ -53,9 +54,11 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi
         if (!blackboard.TryGetValue<EntityUid>(TargetKey, out var target, _entMan) || _entMan.Deleted(target))
             return HTNOperatorStatus.Failed;
 
-        if (!_entMan.TryGetComponent<MedibotComponent>(owner, out var botComp))
+        if (_entMan.HasComponent<SiliconComponent>(target))
             return HTNOperatorStatus.Failed;
 
+        if (!_entMan.TryGetComponent<MedibotComponent>(owner, out var botComp))
+            return HTNOperatorStatus.Failed;
 
         if (!_entMan.TryGetComponent<DamageableComponent>(target, out var damage))
             return HTNOperatorStatus.Failed;

diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs
@@ -8,6 +8,8 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Silicons.Bots;
 using Content.Shared.Emag.Components;
+using Content.Shared.Silicon.Components;
+
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
 
@@ -64,6 +66,9 @@ public override void Initialize(IEntitySystemManager sysManager)
                 damageQuery.TryGetComponent(entity, out var damage) &&
                 !recentlyInjected.HasComponent(entity))
             {
+                if (_entManager.HasComponent<SiliconComponent>(entity))
+                    continue;
+
                 // no treating dead bodies
                 if (!_medibot.TryGetTreatment(medibot, state.CurrentState, out var treatment))
                     continue;

diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
@@ -130,7 +130,11 @@ private void OnEatMouse(EntityUid uid, FelinidComponent component, EatMouseActio
 
         if (hunger.CurrentThreshold == Shared.Nutrition.Components.HungerThreshold.Overfed)
         {
-            _popupSystem.PopupEntity(Loc.GetString("food-system-you-cannot-eat-any-more"), uid, uid, Shared.Popups.PopupType.SmallCaution);
+            _popupSystem.PopupEntity(
+                Loc.GetString("food-system-you-cannot-eat-any-more"),
+                uid,
+                uid,
+                Shared.Popups.PopupType.SmallCaution);
             return;
         }
 
@@ -147,15 +151,20 @@ private void OnEatMouse(EntityUid uid, FelinidComponent component, EatMouseActio
             _actionsSystem.SetCharges(component.HairballAction, 1); // You get the charge back and that's it. Tough.
             _actionsSystem.SetEnabled(component.HairballAction, true);
         }
+
         Del(component.EatActionTarget.Value);
         component.EatActionTarget = null;
 
         _audio.PlayPvs("/Audio/DeltaV/Items/eatfood.ogg", uid, AudioHelpers.WithVariation(0.15f));
 
         _hungerSystem.ModifyHunger(uid, 50f, hunger);
 
-        if (component.EatAction != null)
+        if (component.EatAction is not null && _actionsSystem.TryGetActionData(uid, out var result))
+        {
+            if (result.AttachedEntity == null)
+                return;
             _actionsSystem.RemoveAction(uid, component.EatAction.Value);
+        }
     }
 
     private void SpawnHairball(EntityUid uid, FelinidComponent component)

diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs b/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs
@@ -95,10 +95,9 @@ private void OnBuckleInteractHand(Entity<BuckleComponent> ent, ref InteractHandE
             return;
 
         if (ent.Comp.BuckledTo != null)
-            TryUnbuckle(ent!, args.User, popup: true);
+            args.Handled = TryUnbuckle(ent!, args.User, popup: true);
 
         // TODO BUCKLE add out bool for whether a pop-up was generated or not.
-        args.Handled = true;
     }
 
     private void AddStrapVerbs(EntityUid uid, StrapComponent component, GetVerbsEvent<InteractionVerb> args)

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/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -8424,3 +8424,16 @@ Entries:
   id: 6558
   time: '2024-12-05T00:13:35.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1313
+- author: sleepyyapril
+  changes:
+    - type: Fix
+      message: You can pick up mobs again with left click.
+    - type: Fix
+      message: No more mob jug spill, including you revenants.
+    - type: Fix
+      message: Set the Gloves of the North Star to the proper attack speed.
+    - type: Fix
+      message: Medibots will no longer try to heal borgs.
+  id: 6559
+  time: '2024-12-05T07:39:32.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1311
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -361,7 +361,7 @@
     sprite: Clothing/Hands/Gloves/northstar.rsi
   - type: MeleeWeapon
     autoAttack: true
-    attackRate: 4
+    attackRate: 0.25
     heavyStaminaCost: 2
     heavyDamageBaseModifier: 1.05
     maxTargets: 1

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1755,10 +1755,6 @@
   - type: FelinidFood # Nyanotrasen - Felinid, ability to eat mice, see Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
   - type: BadFood
   - type: NonSpreaderZombie
-  - type: PreventSpiller
-  - type: RandomBark
-    barkMultiplier: 0.3
-    barkType: mouse
   - 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
@@ -386,4 +386,4 @@
   parent: MobCobraSpace
   suffix: "Salvage Ruleset"
   components:
-    - type: SalvageMobRestrictions
+    - type: SalvageMobRestrictions