diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 18a930acbb04..cc04cb18ebdf 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -55,6 +55,26 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \ /obj/item/stack/sheet/mineral/sandstone/thirty amount = 30 +/* + * Stone + */ + +/obj/item/stack/sheet/mineral/stone + name = "stone brick" + desc = "A stone brick." + singular_name = "stone brick" + icon_state = "sheet-stone" + item_state = "sheet-stone" + throw_speed = 3 + throw_range = 5 + sheettype = "stone" + grind_results = list(/datum/reagent/oxygen = 5, /datum/reagent/silicon = 15) + merge_type = /obj/item/stack/sheet/mineral/stone + +GLOBAL_LIST_INIT(stone_recipes, list ( \ + new/datum/stack_recipe("stone brick tile", /obj/item/stack/tile/stone, 1, 4, 20), \ +)) + /* * Sandbags */ diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 6d9365afbb8f..4469c9219894 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -190,6 +190,15 @@ item_state = "tile-basalt" turf_type = /turf/open/floor/grass/fakebasalt +//Stone +/obj/item/stack/tile/stone + name = "stone brick tile" + singular_name = "stone brick tile" + desc = "How rustic." + icon_state = "tile_stone" + item_state = "tile_stone" + turf_type = /turf/open/floor/stone + //Carpets /obj/item/stack/tile/carpet name = "carpet" diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 3ca29103d44a..9881d11d3078 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -290,6 +290,15 @@ walltype = /turf/closed/wall/mineral/sandstone canSmoothWith = list(/obj/structure/falsewall/sandstone, /turf/closed/wall/mineral/sandstone) +/obj/structure/falsewall/stone + name = "stone wall" + desc = "A wall with stone plating. Smooth." + icon = 'icons/turf/walls/stone_wall.dmi' + icon_state = "stone" + mineral = /obj/item/stack/sheet/mineral/stone + walltype = /turf/closed/wall/mineral/stone + canSmoothWith = list(/obj/structure/falsewall/stone, /turf/closed/wall/mineral/stone) + /obj/structure/falsewall/wood name = "wooden wall" desc = "A wall with wooden plating. Stiff." diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 5003791ed8eb..12e1fa0d64db 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -323,4 +323,4 @@ name = "stone brick floor" desc = "Some stone brick tiles, how rustic." icon_state = "stone_floor" - floor_tile = /obj/item/stack/tile/plasteel \ No newline at end of file + floor_tile = /obj/item/stack/tile/stone \ No newline at end of file diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index 4f3960ac2d02..3f899ef77d6a 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -29,6 +29,8 @@ /turf/open/floor/plating/asteroid/proc/getDug() new digResult(src, 5) + if(prob(50)) + new /obj/item/stack/sheet/mineral/stone(src, rand(5)) if(postdig_icon_change) if(!postdig_icon) icon_plating = "[environment_type]_dug" diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm index 5636dce78a18..c0638dde2c6e 100644 --- a/code/game/turfs/simulated/wall/mineral_walls.dm +++ b/code/game/turfs/simulated/wall/mineral_walls.dm @@ -54,6 +54,15 @@ explosion_block = 0 canSmoothWith = list(/turf/closed/wall/mineral/sandstone, /obj/structure/falsewall/sandstone) +/turf/closed/wall/mineral/stone + name = "stone wall" + desc = "A wall with stone plating. Smooth." + icon = 'icons/turf/walls/stone_wall.dmi' + icon_state = "stone" + sheet_type = /obj/item/stack/sheet/mineral/stone + explosion_block = 1 + canSmoothWith = list(/turf/closed/wall/mineral/stone, /obj/structure/falsewall/stone) + /turf/closed/wall/mineral/uranium article = "a" name = "uranium wall"