mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-25 22:28:44 +01:00
More appropriate stack digestion
This commit is contained in:
@@ -75,7 +75,21 @@
|
||||
qdel(O)
|
||||
else if(item_storage)
|
||||
O.forceMove(item_storage)
|
||||
<<<<<<< HEAD
|
||||
qdel(src)
|
||||
=======
|
||||
if(istype(src,/obj/item/stack))
|
||||
var/obj/item/stack/S = src
|
||||
if(S.get_amount() <= 1)
|
||||
qdel(src)
|
||||
else
|
||||
S.use(1)
|
||||
digest_stage = w_class
|
||||
else
|
||||
qdel(src)
|
||||
if(g_damage > w_class)
|
||||
return w_class
|
||||
>>>>>>> 04c4c68140... Merge pull request #11918 from Verkister/patch-102
|
||||
return g_damage
|
||||
|
||||
/////////////
|
||||
|
||||
Reference in New Issue
Block a user