From 005f8f18893422ca8e6c48ed2f33c8182afe8df2 Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 25 Mar 2017 16:29:09 -0300 Subject: [PATCH] Fixes sheets runtiming on ORM (#25464) --- code/game/objects/items/stacks/sheets/mineral.dm | 2 +- code/game/objects/items/stacks/tiles/light.dm | 2 +- code/modules/mining/machine_redemption.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index a88c13415fb..61eb42d6ca4 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -46,7 +46,7 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT) sheettype = "sandstone" -/obj/item/stack/sheet/mineral/sandstone/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/sandstone/Initialize(mapload, new_amount, merge = TRUE) recipes = sandstone_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 682060e0b6a..3e9117cbdfb 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -8,7 +8,7 @@ turf_type = /turf/open/floor/light var/state = 0 -/obj/item/stack/tile/light/New(var/loc, var/amount=null) +/obj/item/stack/tile/light/Initialize(mapload, new_amount, merge = TRUE) ..() if(prob(5)) state = 3 //broken diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 49b5a7a7710..2928857f2bb 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -232,7 +232,7 @@ if(!(text2path(href_list["release"]) in stack_list)) return var/obj/item/stack/sheet/inp = stack_list[text2path(href_list["release"])] - var/obj/item/stack/sheet/out = new inp.type(src,merge=FALSE) + var/obj/item/stack/sheet/out = new inp.type(src, 0, FALSE) var/desired = input("How many sheets?", "How many sheets to eject?", 1) as null|num out.amount = round(min(desired,50,inp.amount)) if(out.amount)