Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760

[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
This commit is contained in:
LetterJay
2018-05-14 12:28:41 -05:00
committed by GitHub
24 changed files with 171 additions and 227 deletions
+1 -2
View File
@@ -355,8 +355,7 @@
return
user.visible_message("<span class='notice'>[user] removes the wires from [src].</span>", \
"<span class='notice'>You remove the wiring from [src], exposing the circuit board.</span>")
var/obj/item/stack/cable_coil/B = new(get_turf(src))
B.amount = 5
new/obj/item/stack/cable_coil(get_turf(src), 5)
constructionStep = CONSTRUCTION_GUTTED
update_icon()
return
+1 -2
View File
@@ -65,8 +65,7 @@
return
/obj/item/stack/sheet/hairlesshide/machine_wash(obj/machinery/washing_machine/WM)
var/obj/item/stack/sheet/wetleather/WL = new(loc)
WL.amount = amount
new /obj/item/stack/sheet/wetleather(drop_location(), amount)
qdel(src)
/obj/item/clothing/suit/hooded/ian_costume/machine_wash(obj/machinery/washing_machine/WM)