cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 18:13:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #441 from SamCroswell/master

Browse Source 
Quick-Equip Hotkey Fix, Pulse Rifle Icon Fix
This commit is contained in:
Fox-McCloud
2015-02-27 20:07:34 -05:00
parent d89c885a14 75b2220e3e
commit 87c15c4e3f
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/RCD.dm
+3 -3
View File
@@ -30,7 +30,7 @@ RCD
New()
desc = "A RCD. It currently holds [matter]/100 matter-units."
desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
src.spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
@@ -44,9 +44,9 @@ RCD
if((matter + R.ammoamt) > max_matter)
user << "<span class='notice'>The RCD cant hold any more matter-units.</span>"
return
matter += R.ammoamt
user.drop_item()
del(W)
matter += R.ammoamt
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
user << "<span class='notice'>The RCD now holds [matter]/[max_matter] matter-units.</span>"
desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
@@ -168,7 +168,7 @@ RCD
if(matter < amount)
return 0
matter -= amount
desc = "A RCD. It currently holds [matter]/100 matter-units."
desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
return 1
/obj/item/weapon/rcd/proc/checkResource(var/amount, var/mob/user)