diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm index 4df16d69e74..36167f10fe2 100644 --- a/code/WorkInProgress/mining.dm +++ b/code/WorkInProgress/mining.dm @@ -2224,7 +2224,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0) if (ore_uranium > 0) ore_uranium--; - new /obj/item/weapon/ore/uranium(output.loc) + new /obj/item/stack/sheet/uranium(output.loc) else on = 0 continue @@ -2389,8 +2389,10 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( dat += text("Gold: [machine.ore_gold] Release
") if(machine.ore_silver) dat += text("Silver: [machine.ore_silver] Release
") + if(machine.ore_uranium) + dat += text("Uranium: [machine.ore_uranium] Release
") if(machine.ore_diamond) - dat += text("Damond: [machine.ore_diamond] Release
") + dat += text("Diamond: [machine.ore_diamond] Release
") if(machine.ore_clown) dat += text("Bananium: [machine.ore_clown] Release

") @@ -2411,6 +2413,12 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( G.amount = machine.ore_plasma G.loc = machine.output.loc machine.ore_plasma = 0 + if ("uranium") + if (machine.ore_uranium > 0) + var/obj/item/stack/sheet/uranium/G = new /obj/item/stack/sheet/uranium + G.amount = machine.ore_uranium + G.loc = machine.output.loc + machine.ore_uranium = 0 if ("glass") if (machine.ore_glass > 0) var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass @@ -2482,6 +2490,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( var/ore_diamond = 0; var/ore_plasma = 0; var/ore_iron = 0; + var/ore_uranium = 0; var/ore_clown = 0; var/ore_glass = 0; var/ore_rglass = 0; @@ -2530,6 +2539,10 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( ore_clown+= O:amount del(O) continue + if (istype(O,/obj/item/stack/sheet/uranium)) + ore_uranium+= O:amount + del(O) + continue if (istype(O,/obj/item/stack/sheet/glass)) ore_glass+= O:amount del(O) @@ -2582,6 +2595,12 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( G.loc = output.loc ore_clown -= stack_amt return + if (ore_uranium >= stack_amt) + var/obj/item/stack/sheet/uranium/G = new /obj/item/stack/sheet/uranium + G.amount = stack_amt + G.loc = output.loc + ore_uranium -= stack_amt + return if (ore_glass >= stack_amt) var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass G.amount = stack_amt @@ -3195,6 +3214,16 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 +/obj/item/stack/sheet/uranium + name = "Uranium block" + icon_state = "sheet-uranium" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_speed = 3 + throw_range = 3 + origin_tech = "materials=5" + /obj/item/stack/sheet/plasma name = "solid plasma" icon_state = "sheet-plasma" diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index c915018a33b..cc92e2bf311 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ