mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-28 01:51:46 +00:00
45c14f6330
Adds SIGNAL_HANDLER, a macro that sets SHOULD_NOT_SLEEP(TRUE). This should ideally be required on all new signal callbacks. Adds BLOCKING_SIGNAL_HANDLER, a macro that does nothing except symbolize "this is an older signal that didn't necessitate a code rewrite". It should not be allowed for new work. This comes from discussion around #52735, which yields by calling input, and (though it sets the return type beforehand) will not properly return the flag to prevent attack from slapping. To fix 60% of the yielding cases, WrapAdminProcCall no longer waits for another admin's proc call to finish. I'm not an admin, so I don't know how many behinds this has saved, but if this is problematic for admins I can just make it so that it lets you do it anyway. I'm not sure what the point of this babysitting was anyway. Requested by @optimumtact. Changelog cl admin: Calling a proc while another admin is calling one will no longer wait for the first to finish. You will simply just have to call it again. /cl
32 lines
1.0 KiB
Plaintext
32 lines
1.0 KiB
Plaintext
/datum/component/spraycan_paintable
|
|
var/current_paint
|
|
|
|
/datum/component/spraycan_paintable/Initialize()
|
|
RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/Repaint)
|
|
|
|
/datum/component/spraycan_paintable/Destroy()
|
|
RemoveCurrentCoat()
|
|
return ..()
|
|
|
|
/datum/component/spraycan_paintable/proc/RemoveCurrentCoat()
|
|
var/atom/A = parent
|
|
A.remove_atom_colour(FIXED_COLOUR_PRIORITY, current_paint)
|
|
|
|
/datum/component/spraycan_paintable/proc/Repaint(datum/source, obj/item/toy/crayon/spraycan/spraycan, mob/living/user)
|
|
SIGNAL_HANDLER
|
|
|
|
if(!istype(spraycan) || user.a_intent == INTENT_HARM)
|
|
return
|
|
. = COMPONENT_NO_AFTERATTACK
|
|
if(spraycan.is_capped)
|
|
to_chat(user, "<span class='warning'>Take the cap off first!</span>")
|
|
return
|
|
RemoveCurrentCoat()
|
|
if(spraycan.use_charges(user, 2))
|
|
var/colour = spraycan.paint_color
|
|
current_paint = colour
|
|
var/atom/A = parent
|
|
A.add_atom_colour(colour, FIXED_COLOUR_PRIORITY)
|
|
playsound(spraycan, 'sound/effects/spray.ogg', 5, TRUE, 5)
|
|
to_chat(user, "<span class='notice'>You spray [spraycan] on [A], painting it.</span>")
|