diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 6402176423a..e7409a4555e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1128,7 +1128,11 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl See the previous More info, for... more info... */ - del(D) + //del(D) + // Garbage Collect Dummy + D.loc = null + D = null + // ------- DUMMY OBJECT'S SERVED IT'S PURPOSE, IT'S REWARDED WITH A SWIFT DELETE ------- if (!( ok )) // ------- TESTS ABOVE DETERMINED YOU CANNOT REACH THE TILE ------- @@ -1357,4 +1361,17 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl return 0 /atom/proc/checkpass(passflag) - return pass_flags&passflag \ No newline at end of file + return pass_flags&passflag + +/* +/client/verb/check_dummy() + set name = "List Dummies" + set category = "Debug" + + var/list/dummies = list() + for(var/obj/item/weapon/dummy/D in world) + usr << "[D] - [D.x], [D.y], [D.z] - [D.loc]" + dummies += D + usr << "[dummies.len] found!" +*/ + diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index f2e2b5185b1..acf65197f5b 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -762,7 +762,10 @@ mob/living/carbon/metroid/var/temperature_resistance = T0C+75 if(!border_obstacle.CanPass(D, D.loc, 1, 0)) ok = 0 - del(D) + //del(D) + //Garbage Collect Dummy + D.loc = null + D = null if (!( ok )) return 0