From 58924dee5b3f0a0ed5142f4ce5af662ca45c61a4 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Thu, 7 Dec 2017 21:31:53 -0500
Subject: [PATCH] tweaks again

---
 code/game/machinery/dye_generator.dm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/code/game/machinery/dye_generator.dm b/code/game/machinery/dye_generator.dm
index 6003f05840a..f3efd7a6c2b 100644
--- a/code/game/machinery/dye_generator.dm
+++ b/code/game/machinery/dye_generator.dm
@@ -94,9 +94,6 @@
 	if(!(M in view(1)))
 		..()
 		return
-	if(!Adjacent(user))
-		..()
-		return
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/dye_list = list("hair", "alt. hair theme")
@@ -109,12 +106,11 @@
 			dye_list += "body"
 
 		var/what_to_dye = input(user, "Choose an area to apply the dye", "Dye Application") in dye_list
-
+		if(!Adjacent(user))
+			to_chat(user, "You are too far away!")
+			return
 		user.visible_message("<span class='notice'>[user] starts dying [M]'s [what_to_dye]!</span>", "<span class='notice'>You start dying [M]'s [what_to_dye]!</span>")
 		if(do_after(user, 50, target = H))
-			if(!Adjacent(H))
-				to_chat(user, "You are too far away!")
-				return
 			switch(what_to_dye)
 				if("hair")
 					H.change_hair_color(dye_color)