From b03ad5892e2874c2990c210adbc608c0c494faae Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 22 Oct 2016 22:27:45 -0400 Subject: [PATCH] Try to fix microBgone bug Hopefully people aren't randomly sent to space anymore? Also cleaned up old debug code for a bug I fixed --- code/controllers/Processes/mob.dm | 6 ------ code/modules/vore/resizing/holder_micro_vr.dm | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/code/controllers/Processes/mob.dm b/code/controllers/Processes/mob.dm index 9935684a1a2..b44842036d9 100644 --- a/code/controllers/Processes/mob.dm +++ b/code/controllers/Processes/mob.dm @@ -12,12 +12,6 @@ mob_list = list() /datum/controller/process/mob/doWork() - if(!global_hud || !global_hud.darkMask) // A fix for a problem I can't find yet. ~Aro - try - global_hud = new() - log_debug("Had to recreate global_hud.") - catch - log_debug("Failed to recreate global_hud.") for(last_object in mob_list) var/mob/M = last_object if(isnull(M.gcDestroyed)) diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm index d86a50e08d0..7287834974c 100644 --- a/code/modules/vore/resizing/holder_micro_vr.dm +++ b/code/modules/vore/resizing/holder_micro_vr.dm @@ -27,7 +27,15 @@ M.help_shake_act(user) /obj/item/weapon/holder/micro/update_state() - // If any items have been dropped by contained mob, drop them to floor. - for(var/obj/O in contents) - O.forceMove(get_turf(src)) - ..() + if(istype(loc,/turf) || !(held_mob) || !(held_mob.loc == src)) + qdel(src) + +/obj/item/weapon/holder/micro/Destroy() + world.log << "Micro DBG: '[src]' handling end. loc=[src.loc] held_mob=[held_mob]" + var/turf/here = get_turf(src) + world.log << "Micro DBG: '[src]' turf = [here]([here.x],[here.y],[here.z])" + for(var/atom/movable/A in src) + world.log << "Micro DBG: '[src]' moving [A] to [here]" + A.forceMove(here) + world.log << "Micro DBG: '[src]' calling up Destroy()" + ..() \ No newline at end of file