From 600866c4a7a85d86c65ea01879cefc89e9021e07 Mon Sep 17 00:00:00 2001 From: FlitchTime Date: Wed, 11 Dec 2024 13:43:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9B=20-=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kitchen_machinery/kitchen_machine.dm | 12 ++++++------ .../reagents/chemistry/machinery/reagentgrinder.dm | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm index 5ebec41bde7..6a84a303e5e 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm @@ -151,11 +151,11 @@ var/mob/living/carbon/human/human = user if(!istype(human)) return - if(operating) + if(!Adjacent(human)) return - if(HAS_TRAIT(user, TRAIT_INCAPACITATED) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + if(human.incapacitated() || HAS_TRAIT(human, TRAIT_HANDS_BLOCKED)) return - if(!Adjacent(user)) + if(operating) return add_fingerprint(user) @@ -165,11 +165,11 @@ var/mob/living/carbon/human/human = user if(!istype(human)) return - if(operating) + if(!Adjacent(human)) return - if(HAS_TRAIT(user, TRAIT_INCAPACITATED) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + if(human.incapacitated() || HAS_TRAIT(human, TRAIT_HANDS_BLOCKED)) return - if(!Adjacent(user)) + if(operating) return add_fingerprint(user) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 59c21a860c4..70be8665e93 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -235,11 +235,11 @@ var/mob/living/carbon/human/human = user if(!istype(human)) return - if(operating) + if(!Adjacent(human)) return - if(HAS_TRAIT(user, TRAIT_INCAPACITATED) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + if(human.incapacitated() || HAS_TRAIT(human, TRAIT_HANDS_BLOCKED)) return - if(!Adjacent(user)) + if(operating) return add_fingerprint(user) @@ -249,11 +249,11 @@ var/mob/living/carbon/human/human = user if(!istype(human)) return - if(operating) + if(!Adjacent(human)) return - if(HAS_TRAIT(user, TRAIT_INCAPACITATED) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + if(human.incapacitated() || HAS_TRAIT(human, TRAIT_HANDS_BLOCKED)) return - if(!Adjacent(user)) + if(operating) return add_fingerprint(user)