From c37856c37cad40474fd54e31a22edd6300486e52 Mon Sep 17 00:00:00 2001
From: Cark <44718209+neeshacark@users.noreply.github.com>
Date: Tue, 5 Dec 2023 23:29:15 -0800
Subject: [PATCH 01/10] stone

---
 code/game/objects/items/stacks/sheets/mineral.dm    | 8 ++++++++
 code/game/objects/items/stacks/tiles/tile_types.dm  | 9 +++++++++
 code/game/turfs/simulated/floor/plating/asteroid.dm | 2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 18a930acbb04..181b103134b4 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -55,6 +55,14 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \
 /obj/item/stack/sheet/mineral/sandstone/thirty
 	amount = 30
 
+/*
+ * 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/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index 4f3960ac2d02..5a7dfcdb32d9 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -17,7 +17,7 @@
 	var/turf_type = /turf/open/floor/plating/asteroid //Because caves do whacky shit to revert to normal
 	var/floor_variance = 20 //probability floor has a different icon state
 	attachment_holes = FALSE
-	var/obj/item/stack/digResult = /obj/item/stack/ore/glass/basalt
+	var/obj/item/stack/digResult = /obj/item/stack/ore/glass/basalt, /obj/item/stack/sheet/stone
 	var/dug
 
 /turf/open/floor/plating/asteroid/Initialize(mapload)

From f29c3288e3499763cb3cac0ddfdbc6d832612e26 Mon Sep 17 00:00:00 2001
From: Cark <44718209+neeshacark@users.noreply.github.com>
Date: Wed, 6 Dec 2023 00:07:26 -0800
Subject: [PATCH 02/10] e

---
 code/game/objects/items/stacks/sheets/mineral.dm    | 12 ++++++++++++
 code/game/turfs/simulated/floor/plating/asteroid.dm |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 181b103134b4..183ee4c36dbd 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -59,6 +59,18 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \
  * 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
+	materials = list(/datum/material/stone=MINERAL_MATERIAL_AMOUNT)
+	sheettype = "stone"
+	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), \
 ))
diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index 5a7dfcdb32d9..c81d004596dc 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -17,7 +17,7 @@
 	var/turf_type = /turf/open/floor/plating/asteroid //Because caves do whacky shit to revert to normal
 	var/floor_variance = 20 //probability floor has a different icon state
 	attachment_holes = FALSE
-	var/obj/item/stack/digResult = /obj/item/stack/ore/glass/basalt, /obj/item/stack/sheet/stone
+	var/obj/item/stack/digResult = /obj/item/stack/ore/glass/basalt
 	var/dug
 
 /turf/open/floor/plating/asteroid/Initialize(mapload)
@@ -29,6 +29,8 @@
 
 /turf/open/floor/plating/asteroid/proc/getDug()
 	new digResult(src, 5)
+	prob(20)
+		new /obj/item/stack/sheet/mineral/stone(src, rand(1,3))
 	if(postdig_icon_change)
 		if(!postdig_icon)
 			icon_plating = "[environment_type]_dug"

From cbed6aec21fcdbaae6888e46df79fc40d0b5bc96 Mon Sep 17 00:00:00 2001
From: Cark <44718209+neeshacark@users.noreply.github.com>
Date: Wed, 6 Dec 2023 00:09:49 -0800
Subject: [PATCH 03/10] e

---
 code/game/turfs/simulated/floor/plating/asteroid.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index c81d004596dc..80bf2a4dec29 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -29,7 +29,7 @@
 
 /turf/open/floor/plating/asteroid/proc/getDug()
 	new digResult(src, 5)
-	prob(20)
+	if(prob(20))
 		new /obj/item/stack/sheet/mineral/stone(src, rand(1,3))
 	if(postdig_icon_change)
 		if(!postdig_icon)

From 1eee7a98eba1c672005b302ddf3426412cd39659 Mon Sep 17 00:00:00 2001
From: Cark <44718209+neeshacark@users.noreply.github.com>
Date: Wed, 6 Dec 2023 00:16:48 -0800
Subject: [PATCH 04/10] e

---
 code/game/objects/items/stacks/sheets/mineral.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 183ee4c36dbd..df16224526e2 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -67,7 +67,6 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \
 	item_state = "sheet-stone"
 	throw_speed = 3
 	throw_range = 5
-	materials = list(/datum/material/stone=MINERAL_MATERIAL_AMOUNT)
 	sheettype = "stone"
 	merge_type = /obj/item/stack/sheet/mineral/stone
 

From 8a7f619d3ab26980c9b468d1d85ef8f46a1e68a7 Mon Sep 17 00:00:00 2001
From: Cark <44718209+neeshacark@users.noreply.github.com>
Date: Wed, 6 Dec 2023 00:52:54 -0800
Subject: [PATCH 05/10] wall

---
 code/game/turfs/simulated/wall/mineral_walls.dm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm
index 5636dce78a18..50eecaa14f6c 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 = 0
+	canSmoothWith = list(/turf/closed/wall/mineral/stone, /obj/structure/falsewall/stone)
+
 /turf/closed/wall/mineral/uranium
 	article = "a"
 	name = "uranium wall"

From 1c993cd673071783a2e508c0a3824aec7b26dd90 Mon Sep 17 00:00:00 2001
From: Cark <44718209+neeshacark@users.noreply.github.com>
Date: Wed, 6 Dec 2023 00:58:06 -0800
Subject: [PATCH 06/10] stone

---
 code/game/objects/structures/false_walls.dm | 9 +++++++++
 1 file changed, 9 insertions(+)

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."

From d1180f9876eff0367841930fa10f0adc07678d6e Mon Sep 17 00:00:00 2001
From: Cark <44718209+neeshacark@users.noreply.github.com>
Date: Wed, 6 Dec 2023 01:01:49 -0800
Subject: [PATCH 07/10] buff

---
 code/game/turfs/simulated/wall/mineral_walls.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm
index 50eecaa14f6c..c0638dde2c6e 100644
--- a/code/game/turfs/simulated/wall/mineral_walls.dm
+++ b/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -60,7 +60,7 @@
 	icon = 'icons/turf/walls/stone_wall.dmi'
 	icon_state = "stone"
 	sheet_type = /obj/item/stack/sheet/mineral/stone
-	explosion_block = 0
+	explosion_block = 1
 	canSmoothWith = list(/turf/closed/wall/mineral/stone, /obj/structure/falsewall/stone)
 
 /turf/closed/wall/mineral/uranium

From 408363a61e38c93324a2cdd5ee6e874d832c7eb1 Mon Sep 17 00:00:00 2001
From: Cark <44718209+neeshacark@users.noreply.github.com>
Date: Wed, 6 Dec 2023 01:07:29 -0800
Subject: [PATCH 08/10] stone

---
 code/game/turfs/simulated/floor/misc_floor.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 5649c7da24f0f85e34a99e2bcb35982e2d1513c5 Mon Sep 17 00:00:00 2001
From: Cark <44718209+neeshacark@users.noreply.github.com>
Date: Wed, 6 Dec 2023 01:11:20 -0800
Subject: [PATCH 09/10] grind

---
 code/game/objects/items/stacks/sheets/mineral.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index df16224526e2..cc04cb18ebdf 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -68,6 +68,7 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \
 	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 ( \

From 55d614a7a3cd2bc2bae98fd6d31a84208c9bf6e7 Mon Sep 17 00:00:00 2001
From: Cark <44718209+neeshacark@users.noreply.github.com>
Date: Wed, 6 Dec 2023 04:13:33 -0800
Subject: [PATCH 10/10] buffs stone gathering

---
 code/game/turfs/simulated/floor/plating/asteroid.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index 80bf2a4dec29..3f899ef77d6a 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -29,8 +29,8 @@
 
 /turf/open/floor/plating/asteroid/proc/getDug()
 	new digResult(src, 5)
-	if(prob(20))
-		new /obj/item/stack/sheet/mineral/stone(src, rand(1,3))
+	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"