mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 04:26:03 +01:00
Second round of fixes:
- Fixed+Future proofed Mutant Parts Sprites - Fixed Lesser Summon Guns activating the wrong hand - Fixes stacks merge()ing with and consuming themselves
This commit is contained in:
@@ -200,6 +200,8 @@
|
||||
update_icon()
|
||||
|
||||
/obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible
|
||||
if(S == src) //amusingly this can cause a stack to consume itself, let's not allow that.
|
||||
return
|
||||
var/transfer = get_amount()
|
||||
if(S.is_cyborg)
|
||||
transfer = min(transfer, round((S.source.max_energy - S.source.energy) / S.cost))
|
||||
|
||||
Reference in New Issue
Block a user