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:
Remie Richards
2016-09-03 11:40:21 +01:00
parent 897e8c5b88
commit 09fee94db5
5 changed files with 22 additions and 4 deletions
+2
View File
@@ -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))