Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions code/game/objects/items/stacks/sheets/mineral.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
9 changes: 9 additions & 0 deletions code/game/objects/items/stacks/tiles/tile_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 9 additions & 0 deletions code/game/objects/structures/false_walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/simulated/floor/misc_floor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
floor_tile = /obj/item/stack/tile/stone
2 changes: 2 additions & 0 deletions code/game/turfs/simulated/floor/plating/asteroid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 9 additions & 0 deletions code/game/turfs/simulated/wall/mineral_walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down