mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-24 16:41:48 +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>
102 lines
3.0 KiB
Plaintext
102 lines
3.0 KiB
Plaintext
/datum/component/archaeology
|
|
dupe_mode = COMPONENT_DUPE_UNIQUE
|
|
var/list/archdrops = list(/obj/item/bikehorn = list(ARCH_PROB = 100, ARCH_MAXDROP = 1)) // honk~
|
|
var/prob2drop
|
|
var/dug
|
|
var/datum/callback/callback
|
|
|
|
/datum/component/archaeology/Initialize(list/_archdrops = list(), datum/callback/_callback)
|
|
archdrops = _archdrops
|
|
for(var/i in archdrops)
|
|
if(isnull(archdrops[i][ARCH_MAXDROP]))
|
|
archdrops[i][ARCH_MAXDROP] = 1
|
|
stack_trace("ARCHAEOLOGY WARNING: [parent] contained a null max_drop value in [i].")
|
|
if(isnull(archdrops[i][ARCH_PROB]))
|
|
archdrops[i][ARCH_PROB] = 100
|
|
stack_trace("ARCHAEOLOGY WARNING: [parent] contained a null probability value in [i].")
|
|
callback = _callback
|
|
RegisterSignal(parent, COMSIG_PARENT_ATTACKBY,.proc/Dig)
|
|
RegisterSignal(parent, COMSIG_ATOM_EX_ACT, .proc/BombDig)
|
|
RegisterSignal(parent, COMSIG_ATOM_SING_PULL, .proc/SingDig)
|
|
|
|
/datum/component/archaeology/InheritComponent(datum/component/archaeology/A, i_am_original)
|
|
var/list/other_archdrops = A.archdrops
|
|
var/list/_archdrops = archdrops
|
|
for(var/I in other_archdrops)
|
|
_archdrops[I] += other_archdrops[I]
|
|
|
|
/datum/component/archaeology/proc/Dig(datum/source, obj/item/I, mob/living/user)
|
|
SIGNAL_HANDLER
|
|
|
|
if(dug)
|
|
to_chat(user, "<span class='warning'>Looks like someone has dug here already!</span>")
|
|
return
|
|
|
|
if(!isturf(user.loc))
|
|
return
|
|
|
|
if(I.tool_behaviour == TOOL_SHOVEL || I.tool_behaviour == TOOL_MINING)
|
|
to_chat(user, "<span class='notice'>You start digging...</span>")
|
|
|
|
if(I.use_tool(parent, user, 40, volume=50))
|
|
to_chat(user, "<span class='notice'>You dig a hole.</span>")
|
|
gets_dug()
|
|
dug = TRUE
|
|
SSblackbox.record_feedback("tally", "pick_used_mining", 1, I.type)
|
|
return COMPONENT_NO_AFTERATTACK
|
|
|
|
/datum/component/archaeology/proc/gets_dug()
|
|
if(dug)
|
|
return
|
|
else
|
|
var/turf/open/OT = get_turf(parent)
|
|
for(var/thing in archdrops)
|
|
var/maxtodrop = archdrops[thing][ARCH_MAXDROP]
|
|
for(var/i in 1 to maxtodrop)
|
|
if(prob(archdrops[thing][ARCH_PROB])) // can't win them all!
|
|
new thing(OT)
|
|
|
|
if(isopenturf(OT))
|
|
if(OT.postdig_icon_change)
|
|
if(istype(OT, /turf/open/floor/plating/asteroid/) && !OT.postdig_icon)
|
|
var/turf/open/floor/plating/asteroid/AOT = parent
|
|
AOT.icon_plating = "[AOT.environment_type]_dug"
|
|
AOT.icon_state = "[AOT.environment_type]_dug"
|
|
else
|
|
if(isplatingturf(OT))
|
|
var/turf/open/floor/plating/POT = parent
|
|
POT.icon_plating = "[POT.postdig_icon]"
|
|
POT.icon_state = "[OT.postdig_icon]"
|
|
|
|
if(OT.slowdown) //Things like snow slow you down until you dig them.
|
|
OT.slowdown = 0
|
|
dug = TRUE
|
|
if(callback)
|
|
callback.Invoke()
|
|
|
|
/datum/component/archaeology/proc/SingDig(datum/source, S, current_size)
|
|
SIGNAL_HANDLER
|
|
|
|
switch(current_size)
|
|
if(STAGE_THREE)
|
|
if(prob(30))
|
|
gets_dug()
|
|
if(STAGE_FOUR)
|
|
if(prob(50))
|
|
gets_dug()
|
|
else
|
|
if(current_size >= STAGE_FIVE && prob(70))
|
|
gets_dug()
|
|
|
|
/datum/component/archaeology/proc/BombDig(datum/source, severity, target)
|
|
SIGNAL_HANDLER
|
|
|
|
switch(severity)
|
|
if(3)
|
|
return
|
|
if(2)
|
|
if(prob(20))
|
|
gets_dug()
|
|
if(1)
|
|
gets_dug()
|