From 09ba7a67f83cdbf5ad61288d6cfad66df128ac79 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 30 Dec 2014 15:56:14 +1030 Subject: [PATCH] Fixes #7563 --- code/modules/clothing/spacesuits/rig/rig_attackby.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm index 1b54b8f1eee..061973c1378 100644 --- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm +++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm @@ -117,7 +117,10 @@ user << "There is not tank to remove." return - user.put_in_hands(air_supply) + if(user.r_hand && user.l_hand) + air_supply.loc = get_turf(user) + else + user.put_in_hands(air_supply) user << "You detach and remove \the [air_supply]." air_supply = null return @@ -146,7 +149,10 @@ user << "You detatch \the [cell] from \the [src]'s battery mount." for(var/obj/item/rig_module/module in installed_modules) module.deactivate() - cell.loc = user.put_in_hands(cell) + if(user.r_hand && user.l_hand) + cell.loc = get_turf(user) + else + cell.loc = user.put_in_hands(cell) cell = null else user << "There is nothing loaded in that mount."