From c1246323f9efb5ec292f74c8f48e9ba96d2f9491 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 25 Jan 2012 14:14:30 -0700 Subject: [PATCH] Prepping... --- code/game/objects/items/weapons/RCD.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index c9db24851ca..ecb0b24d9a8 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -38,11 +38,12 @@ RCD attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if(istype(W, /obj/item/weapon/rcd_ammo)) - if((matter + 10) > max_matter) + var/obj/item/weapon/rcd_ammo/R = W + if((matter + R.ammo) > max_matter) user << "The RCD cant hold any more matter." return + matter += R.ammo del(W) - matter += 10 playsound(src.loc, 'click.ogg', 50, 1) user << "The RCD now holds [matter]/[max_matter] matter-units." desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."