diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm index 82303a69c99..6945b201d44 100644 --- a/code/WorkInProgress/mining.dm +++ b/code/WorkInProgress/mining.dm @@ -2525,6 +2525,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( throw_speed = 3 throw_range = 3 origin_tech = "materials=4" + perunit = 2000 /obj/item/stack/sheet/gold/New() pixel_x = rand(0,4)-4 @@ -2539,6 +2540,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( throw_speed = 3 throw_range = 3 origin_tech = "materials=3" + perunit = 2000 /obj/item/stack/sheet/silver/New() pixel_x = rand(0,4)-4 @@ -2552,6 +2554,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( w_class = 3.0 throw_range = 3 origin_tech = "materials=6" + perunit = 1000 /obj/item/stack/sheet/diamond/New() pixel_x = rand(0,4)-4 @@ -2566,6 +2569,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( throw_speed = 3 throw_range = 3 origin_tech = "materials=5" + perunit = 2000 /obj/item/stack/sheet/enruranium name = "Enriched Uranium block" @@ -2576,6 +2580,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( throw_speed = 3 throw_range = 3 origin_tech = "materials=5" + perunit = 1000 /obj/item/stack/sheet/plasma name = "solid plasma" @@ -2586,6 +2591,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( throw_speed = 3 throw_range = 3 origin_tech = "plasmatech=2;materials=2" + perunit = 2000 /obj/item/stack/sheet/clown name = "bananium" @@ -2596,6 +2602,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( throw_speed = 3 throw_range = 3 origin_tech = "materials=4" + perunit = 2000 /obj/item/stack/sheet/clown/New() pixel_x = rand(0,4)-4 diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 2dc241d3723..561e54218cd 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -898,6 +898,7 @@ flags = FPRINT | TABLEPASS w_class = 3.0 max_amount = 50 + var/perunit = 3750 /obj/item/stack/sheet/glass name = "glass" diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 9c7f1bcbf23..c2c8c6407b6 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -225,25 +225,25 @@ var/amnt if(istype(W, /obj/item/stack/sheet/gold)) material = "gold" - amnt = "g_amt" + amnt = W:perunit else if(istype(W, /obj/item/stack/sheet/silver)) material = "silver" - amnt = "g_amt" + amnt = W:perunit else if(istype(W, /obj/item/stack/sheet/diamond)) material = "diamond" - amnt = "g_amt" + amnt = W:perunit else if(istype(W, /obj/item/stack/sheet/plasma)) material = "plasma" - amnt = "g_amt" + amnt = W:perunit else if(istype(W, /obj/item/stack/sheet/metal)) material = "metal" - amnt = "m_amt" + amnt = W:perunit else if(istype(W, /obj/item/stack/sheet/glass)) material = "glass" - amnt = "g_amt" + amnt = W:perunit else if(istype(W, /obj/item/stack/sheet/clown)) material = "bananium" - amnt = "g_amt" + amnt = W:perunit else return ..() @@ -257,7 +257,7 @@ spawn(10) if(W && W.amount) while(src.resources[material] < res_max_amount && W) - src.resources[material] += W.vars[amnt] + src.resources[material] += amnt W.use(1) count++ flick("mechfab2", src)