Merge pull request #29693

This commit is contained in:
Cyberboss
2017-08-04 10:21:07 -04:00
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -22,7 +22,7 @@
var/novariants = TRUE //Determines whether the item should update it's sprites based on amount.
/obj/item/stack/Initialize(mapload, new_amount=null , merge = TRUE)
..()
. = ..()
if(new_amount)
amount = new_amount
if(!merge_type)
@@ -33,7 +33,7 @@
var/illustration = "writing"
/obj/item/weapon/storage/box/Initialize(mapload)
..()
. = ..()
update_icon()
/obj/item/weapon/storage/box/update_icon()
@@ -38,7 +38,7 @@
/obj/structure/closet/Initialize(mapload)
if(mapload && !opened) // if closed, any item at the crate's loc is put in the contents
addtimer(CALLBACK(src, .proc/take_contents), 0)
..()
. = ..()
update_icon()
PopulateContents()