From f27e6e106b908bd587f508e4768038ef6442b7ec Mon Sep 17 00:00:00 2001 From: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Date: Thu, 15 May 2025 08:31:14 +0100 Subject: [PATCH] Painting materials (#17688) Added the ability to recolour material stacks (such as plastic). Some items crafted from stacks (such as curtains or beds) inherit the color variable of the stack, now you can actually recolour your stack to take advantage of this! --- 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 9c8377e248a..5894a8d41e3 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)