mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-09 00:13:55 +00:00
c529b754fb
* Fixes a bunch of callbacks that were being qdeleted, and code cleanup (#77904) ## About The Pull Request  Continuing the work of https://github.com/tgstation/tgstation/pull/77850. it started with finding one that was being missed and causing a runtime...then I noticed a whole lot more. While I was doing this I found callbacks that weren't being nulled in `Destroy()`, so I added that wherever I found these spots as well as some general code cleanup. There were a lot more of these than I initially hoped to encounter so I'm labeling it as a refactor. ## Why It's Good For The Game Fixes lots of runtimes, improves code resiliency. ## Changelog 🆑 refactor: fixed a bunch of instances of callbacks being qdeleted and cleaned up related code /🆑 * Fixes a bunch of callbacks that were being qdeleted, and code cleanup --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
37 lines
1.6 KiB
Plaintext
37 lines
1.6 KiB
Plaintext
/datum/component/wearertargeting/sitcomlaughter
|
|
valid_slots = list(ITEM_SLOT_HANDS, ITEM_SLOT_BELT, ITEM_SLOT_ID, ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET, ITEM_SLOT_SUITSTORE, ITEM_SLOT_DEX_STORAGE)
|
|
signals = list(COMSIG_MOB_CREAMED, COMSIG_ON_CARBON_SLIP, COMSIG_POST_TILT_AND_CRUSH, COMSIG_MOB_CLUMSY_SHOOT_FOOT)
|
|
proctype = PROC_REF(EngageInComedy)
|
|
mobtype = /mob/living
|
|
///Sounds used for when user has a sitcom action occur
|
|
var/list/comedysounds = list('sound/items/SitcomLaugh1.ogg', 'sound/items/SitcomLaugh2.ogg', 'sound/items/SitcomLaugh3.ogg')
|
|
///Invoked in EngageInComedy is ran
|
|
var/datum/callback/post_comedy_callback
|
|
///Cooldown for inbetween laughs
|
|
var/cooldown_time = 3 SECONDS
|
|
/// Delay before laugh starts
|
|
var/laugh_delay = 0.4 SECONDS
|
|
|
|
COOLDOWN_DECLARE(laugh_cooldown)
|
|
|
|
/datum/component/wearertargeting/sitcomlaughter/Initialize(post_comedy_callback, laugh_delay)
|
|
. = ..()
|
|
if(.) //If this is set something went wrong and we shouldn't init
|
|
return
|
|
src.post_comedy_callback = post_comedy_callback
|
|
if(laugh_delay)
|
|
src.laugh_delay = laugh_delay
|
|
|
|
/datum/component/wearertargeting/sitcomlaughter/Destroy(force, silent)
|
|
post_comedy_callback = null
|
|
return ..()
|
|
|
|
///Play the laugh track if any of the signals related to comedy have been sent.
|
|
/datum/component/wearertargeting/sitcomlaughter/proc/EngageInComedy(datum/source)
|
|
SIGNAL_HANDLER
|
|
if(!COOLDOWN_FINISHED(src, laugh_cooldown))
|
|
return
|
|
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), parent, pick(comedysounds), 100, FALSE, SHORT_RANGE_SOUND_EXTRARANGE), laugh_delay)
|
|
post_comedy_callback?.Invoke(source)
|
|
COOLDOWN_START(src, laugh_cooldown, cooldown_time)
|