From 6146a4ca9a1d87aa928c5b5338698fc3b4e9b9b3 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 17 Jan 2021 20:24:53 -0700
Subject: [PATCH 1/3] Update mob_holder.dm

---
 code/datums/elements/mob_holder.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm
index d770e0f30d..619f674969 100644
--- a/code/datums/elements/mob_holder.dm
+++ b/code/datums/elements/mob_holder.dm
@@ -141,7 +141,7 @@
 
 /obj/item/clothing/head/mob_holder/dropped(mob/user)
 	. = ..()
-	if(held_mob && isturf(loc))//don't release on soft-drops
+	if(held_mob && !ismob(loc))//don't release on soft-drops
 		release()
 
 /obj/item/clothing/head/mob_holder/proc/release()

From 9e52451df897a198e3034dc9a6db9e9e00f190bb Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 17 Jan 2021 20:26:52 -0700
Subject: [PATCH 2/3] Update colormate.dm

---
 code/game/machinery/colormate.dm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/game/machinery/colormate.dm b/code/game/machinery/colormate.dm
index b4306d49a4..81f01a7262 100644
--- a/code/game/machinery/colormate.dm
+++ b/code/game/machinery/colormate.dm
@@ -62,6 +62,8 @@
 		if(!user.transferItemToLoc(I, src))
 			to_chat(user, "<span class='warning'>[I] is stuck to your hand!</span>")
 			return
+		if(QDELETED(I))
+			return
 		user.visible_message("<span class='notice'>[user] inserts [I] into [src]'s receptable.</span>")
 
 		inserted = I
@@ -72,6 +74,11 @@
 /obj/machinery/gear_painter/AllowDrop()
 	return FALSE
 
+/obj/machinery/gear_painter/handle_atom_del(atom/movable/AM)
+	if(AM == inserrted)
+		inserted = null
+	return ..()
+
 /obj/machinery/gear_painter/AltClick(mob/user)
 	. = ..()
 	if(!user.CanReach(src))

From db1693b906e3d4d0bcc214f514743563978e656e Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 17 Jan 2021 20:39:00 -0700
Subject: [PATCH 3/3] Update colormate.dm

---
 code/game/machinery/colormate.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/machinery/colormate.dm b/code/game/machinery/colormate.dm
index 81f01a7262..603b34ee32 100644
--- a/code/game/machinery/colormate.dm
+++ b/code/game/machinery/colormate.dm
@@ -75,7 +75,7 @@
 	return FALSE
 
 /obj/machinery/gear_painter/handle_atom_del(atom/movable/AM)
-	if(AM == inserrted)
+	if(AM == inserted)
 		inserted = null
 	return ..()