diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 7831f13b706..7a3eb6f1e4e 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -384,3 +384,43 @@ stacktype = /obj/item/stack/tile/roofing build_type = /obj/item/stack/tile/roofing can_weld = FALSE + +/obj/item/stack/tile/floor/gold + name = "gold floor tile" + singular_name = "gold floor tile" + icon_state = "tile-gold" + matter = list(MAT_GOLD = SHEET_MATERIAL_AMOUNT / 4) + welds_into = /obj/item/stack/material/gold + no_variants = FALSE + +/obj/item/stack/tile/floor/silver + name = "silver floor tile" + singular_name = "silver floor tile" + icon_state = "tile-silver" + matter = list(MAT_SILVER = SHEET_MATERIAL_AMOUNT / 4) + welds_into = /obj/item/stack/material/silver + no_variants = FALSE + +/obj/item/stack/tile/floor/phoron + name = "phoron floor tile" + singular_name = "phoron floor tile" + icon_state = "tile-phoron" + matter = list(MAT_PHORON = SHEET_MATERIAL_AMOUNT / 4) + welds_into = /obj/item/stack/material/phoron + no_variants = FALSE + +/obj/item/stack/tile/floor/diamond + name = "diamond floor tile" + singular_name = "diamond floor tile" + icon_state = "tile-diamond" + matter = list(MAT_DIAMOND = SHEET_MATERIAL_AMOUNT / 4) + welds_into = /obj/item/stack/material/diamond + no_variants = FALSE + +/obj/item/stack/tile/floor/uranium + name = "uranium floor tile" + singular_name = "uranium floor tile" + icon_state = "tile-uranium" + matter = list(MAT_URANIUM = SHEET_MATERIAL_AMOUNT / 4) + welds_into = /obj/item/stack/material/uranium + no_variants = FALSE diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index 5d6a7ed22f3..e2f83029beb 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -291,3 +291,57 @@ /turf/simulated/shuttle/floor/voidcraft/external/dark /turf/simulated/shuttle/floor/voidcraft/external/light + +/turf/simulated/floor/tiled/material + icon = 'icons/turf/floors.dmi' + +/decl/flooring/tiling/material + name = "material floor" + icon_base = "steel" + icon = 'icons/turf/floors.dmi' + flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK + +/turf/simulated/floor/tiled/material/uranium + icon_state = "uranium" + initial_flooring = /decl/flooring/tiling/material/uranium + +/decl/flooring/tiling/material/uranium + name = "uranium floor" + icon_base = "uranium" + build_type = /obj/item/stack/tile/floor/uranium + +/turf/simulated/floor/tiled/material/phoron + icon_state = "phoron" + initial_flooring = /decl/flooring/tiling/material/phoron + +/decl/flooring/tiling/material/phoron + name = "phoron floor" + icon_base = "phoron" + build_type = /obj/item/stack/tile/floor/phoron + +/turf/simulated/floor/tiled/material/gold + icon_state = "gold" + initial_flooring = /decl/flooring/tiling/material/gold + +/decl/flooring/tiling/material/gold + name = "gold floor" + icon_base = "gold" + build_type = /obj/item/stack/tile/floor/gold + +/turf/simulated/floor/tiled/material/silver + icon_state = "silver" + initial_flooring = /decl/flooring/tiling/material/silver + +/decl/flooring/tiling/material/silver + name = "silver floor" + icon_base = "silver" + build_type = /obj/item/stack/tile/floor/silver + +/turf/simulated/floor/tiled/material/diamond + icon_state = "diamond" + initial_flooring = /decl/flooring/tiling/material/diamond + +/decl/flooring/tiling/material/diamond + name = "diamond floor" + icon_base = "diamond" + build_type = /obj/item/stack/tile/floor/diamond diff --git a/code/modules/materials/materials/metals/diamond.dm b/code/modules/materials/materials/metals/diamond.dm new file mode 100644 index 00000000000..7f364ca8c44 --- /dev/null +++ b/code/modules/materials/materials/metals/diamond.dm @@ -0,0 +1,7 @@ +/datum/material/diamond/generate_recipes() + ..() + recipes += list( + new /datum/stack_recipe_list("floor tiles", list( + new /datum/stack_recipe("diamond floor tile", /obj/item/stack/tile/floor/diamond, 1, 4, 20, recycle_material = "[name]") + )) + ) diff --git a/code/modules/materials/materials/metals/gold.dm b/code/modules/materials/materials/metals/gold.dm new file mode 100644 index 00000000000..dbf2732ec00 --- /dev/null +++ b/code/modules/materials/materials/metals/gold.dm @@ -0,0 +1,7 @@ +/datum/material/gold/generate_recipes() + ..() + recipes += list( + new /datum/stack_recipe_list("floor tiles", list( + new /datum/stack_recipe("gold floor tile", /obj/item/stack/tile/floor/gold, 1, 4, 20, recycle_material = "[name]") + )) + ) diff --git a/code/modules/materials/materials/metals/phoron.dm b/code/modules/materials/materials/metals/phoron.dm new file mode 100644 index 00000000000..a465c771e11 --- /dev/null +++ b/code/modules/materials/materials/metals/phoron.dm @@ -0,0 +1,7 @@ +/datum/material/phoron/generate_recipes() + ..() + recipes += list( + new /datum/stack_recipe_list("floor tiles", list( + new /datum/stack_recipe("phoron floor tile", /obj/item/stack/tile/floor/phoron, 1, 4, 20, recycle_material = "[name]") + )) + ) diff --git a/code/modules/materials/materials/metals/silver.dm b/code/modules/materials/materials/metals/silver.dm new file mode 100644 index 00000000000..c87a1564e37 --- /dev/null +++ b/code/modules/materials/materials/metals/silver.dm @@ -0,0 +1,7 @@ +/datum/material/silver/generate_recipes() + ..() + recipes += list( + new /datum/stack_recipe_list("floor tiles", list( + new /datum/stack_recipe("silver floor tile", /obj/item/stack/tile/floor/silver, 1, 4, 20, recycle_material = "[name]") + )) + ) diff --git a/code/modules/materials/materials/metals/uranium.dm b/code/modules/materials/materials/metals/uranium.dm new file mode 100644 index 00000000000..43716dfe8c2 --- /dev/null +++ b/code/modules/materials/materials/metals/uranium.dm @@ -0,0 +1,7 @@ +/datum/material/uranium/generate_recipes() + ..() + recipes += list( + new /datum/stack_recipe_list("floor tiles", list( + new /datum/stack_recipe("uranium floor tile", /obj/item/stack/tile/floor/uranium, 1, 4, 20, recycle_material = "[name]") + )) + ) diff --git a/icons/obj/stacks.dmi b/icons/obj/stacks.dmi index c91861f9662..f397cf22753 100644 Binary files a/icons/obj/stacks.dmi and b/icons/obj/stacks.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 978eb5d9c77..033c6894348 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 0e9b94857ec..f7dd05540b7 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3064,13 +3064,18 @@ #include "code\modules\materials\materials\snow.dm" #include "code\modules\materials\materials\stone.dm" #include "code\modules\materials\materials\supermatter.dm" +#include "code\modules\materials\materials\metals\diamond.dm" +#include "code\modules\materials\materials\metals\gold.dm" #include "code\modules\materials\materials\metals\hull.dm" #include "code\modules\materials\materials\metals\metals.dm" #include "code\modules\materials\materials\metals\metals_vr.dm" +#include "code\modules\materials\materials\metals\phoron.dm" #include "code\modules\materials\materials\metals\plasteel.dm" #include "code\modules\materials\materials\metals\plasteel_vr.dm" +#include "code\modules\materials\materials\metals\silver.dm" #include "code\modules\materials\materials\metals\steel.dm" #include "code\modules\materials\materials\metals\steel_vr.dm" +#include "code\modules\materials\materials\metals\uranium.dm" #include "code\modules\materials\materials\organic\animal_products.dm" #include "code\modules\materials\materials\organic\cloth.dm" #include "code\modules\materials\materials\organic\grass.dm"