Adjust interaction ordering & interaction conditions (#6387)

2022-02-05 15:39:01 +13:00
parent 442d7dbf8e
commit dd61fb46ea
28 changed files with 88 additions and 167 deletions
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
@@ -56,6 +56,7 @@ namespace Content.Server.Nutrition.EntitySystems
        {
            var targetEntity = args.Target;
            if (targetEntity == null ||
+                !args.CanReach ||
                !EntityManager.TryGetComponent(uid, out SmokableComponent? smokable) ||
                smokable.State == SmokableState.Lit)
                return;