diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 63ef81839df..48bc10da28a 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -49,7 +49,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list( new /datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = 1, on_floor = 1), null, new /datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), - new /datum/stack_recipe/rods("metal rod", /obj/item/stack/rods, 1, 2, 60), + new /datum/stack_recipe/rods("metal rod", /obj/item/stack/rods, 1, 2, 50), null, new /datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, time = 25, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("modular console", /obj/machinery/modular_computer/console/buildable/, 10, time = 25, one_per_turf = 1, on_floor = 1), diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index 7f9c6b6535b..8e830f27407 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -17,6 +17,10 @@ mineralType = "uranium" materials = list(MAT_URANIUM=500) +var/global/list/datum/stack_recipe/gold_tile_recipes = list ( \ + new/datum/stack_recipe("fancy gold tile", /obj/item/stack/tile/mineral/gold/fancy, max_res_amount = 20), \ + ) + /obj/item/stack/tile/mineral/gold name = "gold tile" singular_name = "gold floor tile" @@ -26,6 +30,26 @@ mineralType = "gold" materials = list(MAT_GOLD=500) +/obj/item/stack/tile/mineral/gold/New(loc, amount=null) + ..() + recipes = gold_tile_recipes + +var/global/list/datum/stack_recipe/goldfancy_tile_recipes = list ( \ + new/datum/stack_recipe("regular gold tile", /obj/item/stack/tile/mineral/gold, max_res_amount = 20), \ + ) + +/obj/item/stack/tile/mineral/gold/fancy + icon_state = "tile_goldfancy" + turf_type = /turf/simulated/floor/mineral/gold/fancy + +/obj/item/stack/tile/mineral/gold/fancy/New(loc, amount=null) + ..() + recipes = goldfancy_tile_recipes + +var/global/list/datum/stack_recipe/silver_tile_recipes = list ( \ + new/datum/stack_recipe("fancy silver tile", /obj/item/stack/tile/mineral/silver/fancy, max_res_amount = 20), \ + ) + /obj/item/stack/tile/mineral/silver name = "silver tile" singular_name = "silver floor tile" @@ -35,6 +59,22 @@ mineralType = "silver" materials = list(MAT_SILVER=500) +/obj/item/stack/tile/mineral/silver/New(loc, amount=null) + ..() + recipes = silver_tile_recipes + +var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \ + new/datum/stack_recipe("regular silver tile", /obj/item/stack/tile/mineral/silver, max_res_amount = 20), \ + ) + +/obj/item/stack/tile/mineral/silver/fancy + icon_state = "tile_silverfancy" + turf_type = /turf/simulated/floor/mineral/silver/fancy + +/obj/item/stack/tile/mineral/silver/fancy/New(loc, amount=null) + ..() + recipes = silverfancy_tile_recipes + /obj/item/stack/tile/mineral/diamond name = "diamond tile" singular_name = "diamond floor tile" diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm index 5af7cf30673..eb15d3f9e63 100644 --- a/code/game/turfs/simulated/floor/mineral.dm +++ b/code/game/turfs/simulated/floor/mineral.dm @@ -58,6 +58,11 @@ floor_tile = /obj/item/stack/tile/mineral/gold icons = list("gold","gold_dam") +/turf/simulated/floor/mineral/gold/fancy + icon_state = "goldfancy" + floor_tile = /obj/item/stack/tile/mineral/gold/fancy + icons = list("goldfancy","goldfancy_dam") + //SILVER /turf/simulated/floor/mineral/silver name = "silver floor" @@ -65,6 +70,11 @@ floor_tile = /obj/item/stack/tile/mineral/silver icons = list("silver","silver_dam") +/turf/simulated/floor/mineral/silver/fancy + icon_state = "silverfancy" + floor_tile = /obj/item/stack/tile/mineral/silver/fancy + icons = list("silverfancy","silverfancy_dam") + //BANANIUM /turf/simulated/floor/mineral/bananium name = "bananium floor" diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 3849d6939d9..e4fedae838b 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index fb8a893cff6..62ba9c4e66c 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ