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("[user] starts dying [M]'s [what_to_dye]!", "You start dying [M]'s [what_to_dye]!")
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)