shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3853 from Citadel-Station-13/upstream-merge-32351

Browse Source 
[MIRROR] fixes null parent in destroy for components
This commit is contained in:
LetterJay
2017-11-08 01:46:47 -06:00
committed by GitHub
parent ee4415e864 0a40942562
commit 2ec4df456f
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/subsystem/garbage.dm
View File

@@ -263,7 +263,7 @@ SUBSYSTEM_DEF(garbage)
// Should be treated as a replacement for the 'del' keyword.
// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
/proc/qdel(datum/D, force=FALSE)
/proc/qdel(datum/D, force=FALSE, ...)
if(!istype(D))
del(D)
return
@@ -278,7 +278,7 @@ SUBSYSTEM_DEF(garbage)
D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED
var/start_time = world.time
var/start_tick = world.tick_usage
var/hint = D.Destroy(force) // Let our friend know they're about to get fucked up.
var/hint = D.Destroy(arglist(args.Copy(2))) // Let our friend know they're about to get fucked up.
if(world.time != start_time)
I.slept_destroy++
else