Л - логика

ss220-space · Dec 11, 2024 · 600866c · 600866c
1 parent c93ef59
commit 600866c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 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
@@ -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
@@ -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)