From 698bf19e50458669ec295900636e638f2edd386c Mon Sep 17 00:00:00 2001 From: Nerd Lord Date: Tue, 29 Mar 2016 12:23:45 -0400 Subject: [PATCH] Nuke disc forcemoving properly removes from storage items/mobs --- code/game/gamemodes/nuclear/nuclearbomb.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 490971440d9..64a8745f552 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -433,6 +433,12 @@ This is here to make the tiles around the station mininuke change when it's arme if(blobstart.len > 0) var/turf/targetturf = get_turf(pick(blobstart)) var/turf/diskturf = get_turf(src) + if(ismob(loc)) + var/mob/M = loc + M.remove_from_mob(src) + if(istype(loc, /obj/item/weapon/storage)) + var/obj/item/weapon/storage/S = loc + S.remove_from_storage(src, diskturf) forceMove(targetturf) //move the disc, so ghosts remain orbitting it even if it's "destroyed" message_admins("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z] - JMP). Moving it to ([targetturf.x], [targetturf.y], [targetturf.z] - JMP).") log_game("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z]). Moving it to ([targetturf.x], [targetturf.y], [targetturf.z]).")