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>
50 lines
1.4 KiB
Plaintext
50 lines
1.4 KiB
Plaintext
/datum/component/bane
|
|
dupe_mode = COMPONENT_DUPE_ALLOWED
|
|
|
|
var/mobtype
|
|
var/speciestype
|
|
var/damage_multiplier
|
|
|
|
/datum/component/bane/Initialize(mobtype, damage_multiplier=1)
|
|
if(!isitem(parent))
|
|
return COMPONENT_INCOMPATIBLE
|
|
|
|
if(ispath(mobtype, /mob/living))
|
|
src.mobtype = mobtype
|
|
else if(ispath(mobtype, /datum/species))
|
|
speciestype = mobtype
|
|
else
|
|
return COMPONENT_INCOMPATIBLE
|
|
|
|
src.damage_multiplier = damage_multiplier
|
|
|
|
/datum/component/bane/RegisterWithParent()
|
|
if(speciestype)
|
|
RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/speciesCheck)
|
|
else
|
|
RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/mobCheck)
|
|
|
|
/datum/component/bane/UnregisterFromParent()
|
|
UnregisterSignal(parent, COMSIG_ITEM_AFTERATTACK)
|
|
|
|
/datum/component/bane/proc/speciesCheck(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
|
|
SIGNAL_HANDLER
|
|
|
|
if(!proximity_flag || !is_species(target, speciestype))
|
|
return
|
|
activate(source, target, user)
|
|
|
|
/datum/component/bane/proc/mobCheck(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
|
|
SIGNAL_HANDLER
|
|
|
|
if(!proximity_flag || !istype(target, mobtype))
|
|
return
|
|
activate(source, target, user)
|
|
|
|
/datum/component/bane/proc/activate(obj/item/source, mob/living/target, mob/attacker)
|
|
if(attacker.a_intent != INTENT_HARM)
|
|
return
|
|
|
|
var/extra_damage = max(0, source.force * damage_multiplier)
|
|
target.apply_damage(extra_damage, source.damtype, attacker.zone_selected)
|