From 5afb55815ea49a44dd4a68dcd342b69de4b2a3d6 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 1 Jan 2015 23:15:34 +1030 Subject: [PATCH] Fixes #7601 --- code/modules/clothing/spacesuits/rig/rig.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index abbf9c38ee..ca17213bbb 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -287,6 +287,15 @@ /obj/item/weapon/rig/process() + // If we've lost any parts, grab them back. + var/mob/living/M + for(var/obj/item/piece in list(gloves,boots,helmet,chest)) + if(piece.loc != src && !(wearer && piece.loc == wearer)) + if(istype(piece.loc, /mob/living)) + M = piece.loc + M.drop_from_inventory(piece) + piece.loc = src + if(!istype(wearer) || loc != wearer || wearer.back != src || canremove || !cell || cell.charge <= 0) if(!cell || cell.charge <= 0) if(electrified >0)