From 7bfa03a5ee0e99a0cac6d7f522ef1cef8a78fffe Mon Sep 17 00:00:00 2001 From: Vincent Date: Sat, 28 Nov 2015 17:39:02 -0500 Subject: [PATCH] Fixes #13277 Lasers beams spawning after the holdout sim ends --- code/modules/holodeck/area_copy.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/holodeck/area_copy.dm b/code/modules/holodeck/area_copy.dm index ae6236381f6..fe8621fdca4 100644 --- a/code/modules/holodeck/area_copy.dm +++ b/code/modules/holodeck/area_copy.dm @@ -91,11 +91,12 @@ for(var/obj/O in T) var/obj/O2 = DuplicateObject(O , 1, newloc = X, nerf=nerf_weapons) if(!O2) continue - copiedobjs += O2.contents + O2 + copiedobjs += O2.GetAllContents() + O2 for(var/mob/M in T) if(istype(M, /mob/camera)) continue // If we need to check for more mobs, I'll add a variable - copiedobjs += DuplicateObject(M , 1, newloc = X) + var/mob/SM = DuplicateObject(M , 1, newloc = X) + copiedobjs += SM.GetAllContents() + SM var/global/list/forbidden_vars = list("type","stat","loc","locs","vars", "parent", "parent_type","verbs","ckey","key","x","y","z","contents", "luminosity") for(var/V in T.vars - forbidden_vars)