cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow using large cartridges on partially-full RCDs (#39275)

Browse Source
This commit is contained in:
Tad Hardesty
2018-07-23 06:18:32 -04:00
committed by Emmett Gaines
parent 61e6f22414
commit fc647c6533
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/RCD.dm
+6 -3
View File
@@ -57,11 +57,14 @@ RLD
var/loaded = 0
if(istype(W, /obj/item/rcd_ammo))
var/obj/item/rcd_ammo/R = W
if((matter + R.ammoamt) > max_matter)
var/load = min(R.ammoamt, max_matter - matter)
if(load <= 0)
to_chat(user, "<span class='warning'>[src] can't hold any more matter-units!</span>")
return
qdel(W)
matter += R.ammoamt
R.ammoamt -= load
if(R.ammoamt <= 0)
qdel(R)
matter += load
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
loaded = 1
else if(istype(W, /obj/item/stack/sheet/metal) || istype(W, /obj/item/stack/sheet/glass))