From 129ea8078aae0ebdd0749368182e9803de1dc198 Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
 <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Thu, 15 May 2025 10:50:00 -0700
Subject: [PATCH] [MIRROR] Painting materials (#10882)

Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
---
 code/game/machinery/painter_vr.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/machinery/painter_vr.dm b/code/game/machinery/painter_vr.dm
index 9c8377e248..5894a8d41e 100644
--- a/code/game/machinery/painter_vr.dm
+++ b/code/game/machinery/painter_vr.dm
@@ -29,7 +29,8 @@
 		/obj/item/clothing,
 		/obj/item/storage/backpack,
 		/obj/item/storage/belt,
-		/obj/item/toy
+		/obj/item/toy,
+		/obj/item/stack/material
 	)
 
 /obj/machinery/gear_painter/Initialize(mapload)
@@ -68,6 +69,8 @@
 		return
 
 	if(is_type_in_list(I, allowed_types) && !inoperable())
+		if(istype(I,/obj/item/stack/material/cyborg)) //Needs an exception for borg materials to avoid glitches.
+			return
 		user.visible_message(span_notice("[user] inserts \the [I] into the Color Mate receptable."))
 		user.drop_from_inventory(I)
 		I.forceMove(src)