diff --git a/code/datums/callback.dm b/code/datums/callback.dm index 0cbd38db37b8..cdf756b746d9 100644 --- a/code/datums/callback.dm +++ b/code/datums/callback.dm @@ -29,22 +29,21 @@ * ### global proc while in another global proc: * .procname * - * `CALLBACK(GLOBAL_PROC, .some_proc_here)` + * `CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(some_proc_here))` * * ### proc defined on current(src) object (when in a /proc/ and not an override) OR overridden at src or any of it's parents: * .procname * - * `CALLBACK(src, .some_proc_here)` + * `CALLBACK(src, PROC_REF(some_proc_here))` * * ### when the above doesn't apply: * PROC_REF(procname) * * `CALLBACK(src, PROC_REF(some_proc_here))` * + * ### proc defined on a parent of a some type * - * proc defined on a parent of a some type - * - * `TYPE_PROC_REF(/some/type, some_proc_here)` + * `CALLBACK(src, TYPE_PROC_REF(/some/type, some_proc_here))` * * Otherwise you must always provide the full typepath of the proc (/type/of/thing/proc/procname) */ diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index b2edda23b6db..aefc5249f54d 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -108,6 +108,8 @@ /obj/singularity/narsie/large/cult/Destroy() send_to_playing_players("\"[pick("Nooooo...", "Not die. How-", "Die. Mort-", "Sas tyen re-")]\"") sound_to_playing_players('sound/magic/demon_dies.ogg', 50) + if(GLOB.cult_narsie == src) + GLOB.cult_narsie = null var/list/all_cults = list() for(var/datum/antagonist/cult/C in GLOB.antagonists) if(!C.owner) diff --git a/dependencies.sh b/dependencies.sh index 4815ef1a3363..eccb8678fd3a 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -27,4 +27,4 @@ export PYTHON_VERSION=3.7.9 export AUXMOS_REPO=https://github.com/Putnam3145/auxmos #auxmos version -export AUXMOS_VERSION=015ffed6c76dcae8ab2a4deeca8e25d9e78321d9 +export AUXMOS_VERSION=ee3a96c6645326bee6e332ffc859b786e71e05a8