mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-26 17:41:05 +00:00
e65a48e91f
* Adds SIGNAL_HANDLER and SIGNAL_HANDLER_DOES_SLEEP to prevent signal callbacks from blocking (#52761) 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 * Adds SIGNAL_HANDLER and SIGNAL_HANDLER_DOES_SLEEP to prevent signal callbacks from blocking Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
30 lines
1.0 KiB
Plaintext
30 lines
1.0 KiB
Plaintext
/obj/effect/blessing
|
|
name = "holy blessing"
|
|
desc = "Holy energies interfere with ethereal travel at this location."
|
|
icon = 'icons/effects/effects.dmi'
|
|
icon_state = null
|
|
anchored = TRUE
|
|
density = FALSE
|
|
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
|
|
|
/obj/effect/blessing/Initialize(mapload)
|
|
. = ..()
|
|
for(var/obj/effect/blessing/B in loc)
|
|
if(B != src)
|
|
return INITIALIZE_HINT_QDEL
|
|
var/image/I = image(icon = 'icons/effects/effects.dmi', icon_state = "blessed", layer = ABOVE_OPEN_TURF_LAYER, loc = src)
|
|
I.alpha = 64
|
|
I.appearance_flags = RESET_ALPHA
|
|
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessed_aware, "blessing", I)
|
|
RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, .proc/block_cult_teleport)
|
|
|
|
/obj/effect/blessing/Destroy()
|
|
UnregisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT)
|
|
return ..()
|
|
|
|
/obj/effect/blessing/proc/block_cult_teleport(datum/source, channel, turf/origin, turf/destination)
|
|
SIGNAL_HANDLER
|
|
|
|
if(channel == TELEPORT_CHANNEL_CULT)
|
|
return COMPONENT_BLOCK_TELEPORT
|