mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-20 14:45: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>
38 lines
958 B
Plaintext
38 lines
958 B
Plaintext
/**
|
|
* Tool flash bespoke element
|
|
*
|
|
* Flashes the user when using this tool
|
|
*/
|
|
/datum/element/tool_flash
|
|
element_flags = ELEMENT_BESPOKE
|
|
id_arg_index = 2
|
|
/// Strength of the flash
|
|
var/flash_strength
|
|
|
|
/datum/element/tool_flash/Attach(datum/target, flash_strength)
|
|
. = ..()
|
|
if(!isitem(target))
|
|
return ELEMENT_INCOMPATIBLE
|
|
|
|
src.flash_strength = flash_strength
|
|
|
|
RegisterSignal(target, COMSIG_TOOL_IN_USE, .proc/prob_flash)
|
|
RegisterSignal(target, COMSIG_TOOL_START_USE, .proc/flash)
|
|
|
|
/datum/element/tool_flash/Detach(datum/source, force)
|
|
. = ..()
|
|
UnregisterSignal(source, list(COMSIG_TOOL_IN_USE, COMSIG_TOOL_START_USE))
|
|
|
|
/datum/element/tool_flash/proc/prob_flash(datum/source, mob/living/user)
|
|
SIGNAL_HANDLER
|
|
|
|
if(prob(90))
|
|
return
|
|
flash(source, user)
|
|
|
|
/datum/element/tool_flash/proc/flash(datum/source, mob/living/user)
|
|
SIGNAL_HANDLER
|
|
|
|
if(user && get_dist(get_turf(source), get_turf(user)) <= 1)
|
|
user.flash_act(min(flash_strength,1))
|