Check smokable is in mouth (#9281)

space-wizards · Jun 29, 2022 · 7508227 · 7508227
1 parent 7a08f5b
commit 7508227
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
 using Content.Shared.Smoking;
 using Content.Shared.Temperature;
 using Robust.Shared.Containers;
@@ -20,6 +21,7 @@ public sealed partial class SmokingSystem : EntitySystem
         [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
         [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
         [Dependency] private readonly AtmosphereSystem _atmos = default!;
+        [Dependency] private readonly InventorySystem _inventorySystem = default!;
 
         private const float UpdateTimer = 3f;
 
@@ -110,8 +112,11 @@ public override void Update(float frameTime)
                 // This is awful. I hate this so much.
                 // TODO: Please, someone refactor containers and free me from this bullshit.
                 if (!smokable.Owner.TryGetContainerMan(out var containerManager) ||
+                    !(_inventorySystem.TryGetSlotEntity(containerManager.Owner, "mask", out var inMaskSlotUid) && inMaskSlotUid == smokable.Owner) ||
                     !TryComp(containerManager.Owner, out BloodstreamComponent? bloodstream))
+                {
                     continue;
+                }
 
                 _reactiveSystem.ReactionEntity(containerManager.Owner, ReactionMethod.Ingestion, inhaledSolution);
                 _bloodstreamSystem.TryAddToChemicals(containerManager.Owner, inhaledSolution, bloodstream);