Merge pull request #37760 from YPOQ/stackfix

Fixed stacks sometimes having the wrong amount if created on another stack
This commit is contained in:
Tad Hardesty
2018-05-10 23:23:51 -07:00
committed by GitHub
24 changed files with 58 additions and 114 deletions
+1 -2
View File
@@ -147,8 +147,7 @@
to_chat(user, "<span class='notice'>You remove the cables.</span>")
state = SCREWED_CORE
update_icon()
var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc )
A.amount = 5
new /obj/item/stack/cable_coil(drop_location(), 5)
return
if(istype(P, /obj/item/stack/sheet/rglass))
@@ -111,5 +111,5 @@
for(var/i = 0, i<2, i++)
for(var/res in resources)
var/obj/item/stack/R = new res(src)
R.amount = R.max_amount
var/obj/item/stack/R = res
new res(src, initial(R.max_amount))