Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595)

Prevent single-use hyposprays from getting the toggle draw verb

Co-authored-by: Plykiya <plykiya@protonmail.com>

diff --git a/Content.Shared/Chemistry/Components/HyposprayComponent.cs b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
index 05d202aaaa36d6d47bb7065124fb63fee1e0c79e..05ef84bbaf757932326a0c200b0b8cdd963d5e9c 100644 (file)
--- a/Content.Shared/Chemistry/Components/HyposprayComponent.cs
+++ b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
@@ -30,4 +30,11 @@ public sealed partial class HyposprayComponent : Component
     [AutoNetworkedField]
     [DataField(required: true)]
     public bool OnlyAffectsMobs = false;
+
+    /// <summary>
+    /// Whether or not the hypospray is able to draw from containers or if it's a single use
+    /// device that can only inject.
+    /// </summary>
+    [DataField]
+    public bool InjectOnly = false;
 }

diff --git a/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs
index f91e5621f0ae0a3bf697e550d243762146b51e65..b647d33c98c195918cb7c21496542fff94d5f1dd 100644 (file)
--- a/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs
@@ -27,7 +27,7 @@ public abstract class SharedHypospraySystem : EntitySystem
     // </summary>
     private void AddToggleModeVerb(Entity<HyposprayComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null || entity.Comp.InjectOnly)
             return;
 
         var (_, component) = entity;

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index dbc78a8409859c46cd7d111c97a8f7f4c17973cc..d6f3ee75fa6bed5f105fc00b59f37089ca193cd2 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -115,6 +115,7 @@
     solutionName: pen
     transferAmount: 15
     onlyAffectsMobs: false
+    injectOnly: true
   - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 1
@@ -205,6 +206,7 @@
     solutionName: pen
     transferAmount: 20
     onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -236,6 +238,7 @@
     solutionName: pen
     transferAmount: 20
     onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -267,6 +270,8 @@
     solutionName: pen
     transferAmount: 20
     onlyAffectsMobs: false
+    injectOnly: true
+
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -299,6 +304,7 @@
     solutionName: pen
     transferAmount: 30
     onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -337,6 +343,7 @@
     solutionName: pen
     transferAmount: 30
     onlyAffectsMobs: false
+    injectOnly: true
   - type: StaticPrice
     price: 500
   - type: Tag
@@ -397,6 +404,7 @@
     solutionName: pen
     transferAmount: 30
     onlyAffectsMobs: false
+    injectOnly: true
   - type: StaticPrice
     price: 500
   - type: Tag