Merge pull request #15221 from SandPoot/colormate

Colormate tgui + minor tgui updates
2021-10-03 08:51:51 -07:00
parent b688432b5d 887e79aaf0
commit 31467420d7
13 changed files with 559 additions and 138 deletions
@@ -200,6 +200,9 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 	return b["totaldam"] - a["totaldam"]

 /datum/crewmonitor/ui_act(action,params)
+	. = ..()
+	if(.)
+		return
 	var/mob/living/silicon/ai/AI = usr
 	if(!istype(AI))
 		return