From 28a0725bd8a3bda52e57d3685a63db84ff6a858f Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 13 Dec 2020 06:36:20 -0700
Subject: [PATCH] Update colormate.dm

---
 code/game/machinery/colormate.dm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/code/game/machinery/colormate.dm b/code/game/machinery/colormate.dm
index fc187c37a5..9b3b7b8a2a 100644
--- a/code/game/machinery/colormate.dm
+++ b/code/game/machinery/colormate.dm
@@ -130,22 +130,22 @@
 	var/datum/browser/menu = new(user, "colormate","Color Mate Control Panel", 800, 600, src)
 	menu.set_content(dat.Join(""))
 	menu.open()
-	return
 
 /obj/machinery/gear_painter/Topic(href, href_list)
 	if((. = ..()))
 		return
 
-	usr.set_machine(src)
 	add_fingerprint(usr)
 
 	if(href_list["close"])
+		usr << browse(null, "window=colormate")
 		return
 
 	if(href_list["select"])
 		var/newcolor = input(usr, "Choose a color.", "", activecolor) as color|null
 		if(newcolor)
 			activecolor = newcolor
+		updateUsrDialog()
 
 	if(href_list["paint"])
 		if(!inserted)
@@ -154,9 +154,11 @@
 			return
 		inserted.add_atom_colour(activecolor, FIXED_COLOUR_PRIORITY)
 		playsound(src, 'sound/effects/spray3.ogg', 50, 1)
+		updateUsrDialog()
 
 	if(href_list["toggle_matrix_mode"])
 		matrix_mode = !matrix_mode
+		updateUsrDialog()
 
 	if(href_list["matrix_paint"])
 		if(!inserted)
@@ -181,21 +183,22 @@
 			return
 		inserted.add_atom_colour(cm, FIXED_COLOUR_PRIORITY)
 		playsound(src, 'sound/effects/spray3.ogg', 50, 1)
+		updateUsrDialog()
 
 	if(href_list["clear"])
 		if(!inserted)
 			return
 		inserted.remove_atom_colour(FIXED_COLOUR_PRIORITY)
 		playsound(src, 'sound/effects/spray3.ogg', 50, 1)
+		updateUsrDialog()
 
 	if(href_list["eject"])
 		if(!inserted)
 			return
 		inserted.forceMove(drop_location())
 		inserted = null
-
-	update_icon()
-	updateUsrDialog()
+		update_icon()
+		updateUsrDialog()
 
 /obj/machinery/gear_painter/proc/check_valid_color(list/cm, mob/user)
 	if(!islist(cm))		// normal