From fe972186c618fb54a5476b3c698c22eb3f5eb4be Mon Sep 17 00:00:00 2001 From: Toastical Date: Sun, 12 Jan 2025 00:42:13 +0200 Subject: [PATCH 1/4] override attack_self on subtype --- code/game/objects/items/crayons.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index e95e8c945677..237c79c32011 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -317,6 +317,7 @@ /obj/item/toy/crayon/spraycan/New() ..() + RegisterSignal(src, COMSIG_ACTIVATE_SELF, TYPE_PROC_REF(/datum, signal_cancel_activate_self)) update_icon() /obj/item/toy/crayon/spraycan/activate_self(mob/user) From 9c39f19a0ba0afcbae862f75e84e397afbed6ce8 Mon Sep 17 00:00:00 2001 From: Toastical Date: Sun, 12 Jan 2025 01:01:36 +0200 Subject: [PATCH 2/4] whoops --- code/game/objects/items/crayons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 237c79c32011..e8fdb64128c8 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -330,7 +330,7 @@ capped = !capped update_icon() if("Change Drawing") - ..() + update_window(user) if("Change Color") colour = tgui_input_color(user,"Please select a paint color.","Spray Can Color") if(isnull(colour)) From 01f504df95a4270dfe0b95e25daf0b15bd9b4482 Mon Sep 17 00:00:00 2001 From: Toastical Date: Sat, 18 Jan 2025 01:20:22 +0200 Subject: [PATCH 3/4] New to Initialize --- code/game/objects/items/crayons.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index e8fdb64128c8..bc1b474ce14b 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -40,8 +40,8 @@ user.visible_message("[user] is jamming the [name] up [user.p_their()] nose and into [user.p_their()] brain. It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS|OXYLOSS -/obj/item/toy/crayon/New() - ..() +/obj/item/toy/crayon/Initialize(mapload) + . = ..() drawtype = pick(pick(graffiti), pick(letters), "rune[rand(1, 8)]") /obj/item/toy/crayon/activate_self(mob/user) @@ -207,7 +207,8 @@ colour = COLOR_PURPLE dye_color = DYE_PURPLE -/obj/item/toy/crayon/random/New() +/obj/item/toy/crayon/random/Initialize(mapload) + . = ..() icon_state = pick("crayonred", "crayonorange", "crayonyellow", "crayongreen", "crayonblue", "crayonpurple") switch(icon_state) if("crayonred") @@ -315,8 +316,8 @@ dye_color = null // not technically a crayon, so we're not gonna have it dye stuff in the laundry machine consumable = FALSE // To stop you from eating spraycans. It's TOO SILLY! -/obj/item/toy/crayon/spraycan/New() - ..() +/obj/item/toy/crayon/spraycan/Initialize(mapload) + . = ..() RegisterSignal(src, COMSIG_ACTIVATE_SELF, TYPE_PROC_REF(/datum, signal_cancel_activate_self)) update_icon() From e626c372255d2a5f42dbf3d4634edf6a87870c02 Mon Sep 17 00:00:00 2001 From: Toastical Date: Sat, 18 Jan 2025 01:27:26 +0200 Subject: [PATCH 4/4] linter? --- code/game/objects/items/crayons.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index bc1b474ce14b..36ab5e3bd7a0 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -235,7 +235,6 @@ name = "purple crayon" colour = COLOR_PURPLE dye_color = DYE_PURPLE - ..() /obj/item/toy/crayon/black name = "black crayon"