mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-13 08:03:43 +01:00
Fixes spray can double menu (#27944)
* override attack_self on subtype * whoops * New to Initialize * linter? --------- Co-authored-by: Toastical <toast@toaster.com>
This commit is contained in:
@@ -40,8 +40,8 @@
|
||||
user.visible_message("<span class='suicide'>[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!</span>")
|
||||
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")
|
||||
@@ -234,7 +235,6 @@
|
||||
name = "purple crayon"
|
||||
colour = COLOR_PURPLE
|
||||
dye_color = DYE_PURPLE
|
||||
..()
|
||||
|
||||
/obj/item/toy/crayon/black
|
||||
name = "black crayon"
|
||||
@@ -315,8 +315,9 @@
|
||||
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()
|
||||
|
||||
/obj/item/toy/crayon/spraycan/activate_self(mob/user)
|
||||
@@ -329,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))
|
||||
|
||||
Reference in New Issue
Block a user