From a00163a241d59e2f9393908dc1c3cbbe7e302c3f Mon Sep 17 00:00:00 2001 From: VerySoft Date: Tue, 30 Aug 2022 06:26:52 -0400 Subject: [PATCH 1/2] /objs with people in them spit out the people before they Destroy() --- code/game/objects/objs.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index b9e462190a6..cb90f1c642d 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -23,6 +23,20 @@ /obj/Destroy() STOP_PROCESSING(SSobj, src) + + //VOREStation Add Start - I really am an idiot why did I make it this way + if(micro_target) + for(var/thing in src.contents) + if(!ismob(thing)) + continue + var/mob/m = thing + if(isbelly(src.loc)) + m.forceMove(src.loc) + else + m.forceMove(get_turf(src.loc)) + m.visible_message("span class = 'notice'>\The [m] tumbles out of \the [src]!") + //VOREStation Add End + return ..() /obj/Topic(href, href_list, var/datum/tgui_state/state = GLOB.tgui_default_state) From 1a0aadbde62c3111a51d35a146d3922fa81888bb Mon Sep 17 00:00:00 2001 From: VerySoft Date: Tue, 30 Aug 2022 06:32:01 -0400 Subject: [PATCH 2/2] I'm going to bed once this is done I promise --- code/game/objects/objs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index cb90f1c642d..b9a0f53c7d0 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -34,7 +34,7 @@ m.forceMove(src.loc) else m.forceMove(get_turf(src.loc)) - m.visible_message("span class = 'notice'>\The [m] tumbles out of \the [src]!") + m.visible_message("\The [m] tumbles out of \the [src]!") //VOREStation Add End return ..()