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

Fixes stack duping.

Browse Source
This commit is contained in:
xxalpha
2015-03-15 19:04:07 +00:00
parent 4f1e20bd84
commit c9d600e653
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+12 -3
View File
@@ -173,17 +173,24 @@
return 1
/obj/item/stack/proc/use(var/used) // return 0 = borked; return 1 = had enough
if(zero_amount())
return 0
if (is_cyborg)
return source.use_charge(used * cost)
if (amount < used)
return 0
amount -= used
if (amount <= 0)
zero_amount()
update_icon()
return 1
/obj/item/stack/proc/zero_amount()
if (amount < 1)
if(usr)
usr.unEquip(src, 1)
qdel(src)
update_icon()
return 1
return 1
return 0
/obj/item/stack/proc/add(var/amount)
if (is_cyborg)
@@ -210,6 +217,7 @@
/obj/item/stack/attack_hand(mob/user as mob)
if (user.get_inactive_hand() == src)
if(zero_amount()) return
var/obj/item/stack/F = new src.type( user, 1)
F.copy_evidences(src)
user.put_in_hands(F)
@@ -225,6 +233,7 @@
/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params)
if (istype(W, src.type))
if(zero_amount()) return
var/obj/item/stack/S = W
if (S.is_cyborg)
var/to_transfer = min(src.amount, round((S.source.max_energy - S.source.energy) / S.cost))