From 4e15c5e751afe841d2531fcb4709d528cac44d87 Mon Sep 17 00:00:00 2001
From: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
Date: Mon, 10 May 2021 14:48:57 +0100
Subject: [PATCH] Stone walls & Mineable ore veins (#5498)

* all the stuff!

* Additional check for mining ore

* Cleans up the file

I usually make messy files and separate stuff out, makes it easier for me to look at. I probably should neaten up again...

* Apply suggestions from code review

Co-authored-by: Gandalf <jzo123@hotmail.com>

* adds examine tip and more ore veins

Co-authored-by: Gandalf <jzo123@hotmail.com>
---
 code/__DEFINES/icon_smoothing.dm              |   1 +
 .../modules/stone/code/ore_veins.dm           | 134 ++++++++++++++++++
 modular_skyrat/modules/stone/code/stone.dm    |  79 +++++++++++
 modular_skyrat/modules/stone/icons/ore.dmi    | Bin 0 -> 3370 bytes
 modular_skyrat/modules/stone/icons/wall.dmi   | Bin 0 -> 3060 bytes
 tgstation.dme                                 |   2 +
 6 files changed, 216 insertions(+)
 create mode 100644 modular_skyrat/modules/stone/code/ore_veins.dm
 create mode 100644 modular_skyrat/modules/stone/code/stone.dm
 create mode 100644 modular_skyrat/modules/stone/icons/ore.dmi
 create mode 100644 modular_skyrat/modules/stone/icons/wall.dmi

diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm
index bb7c61f8390..e1edb67d048 100644
--- a/code/__DEFINES/icon_smoothing.dm
+++ b/code/__DEFINES/icon_smoothing.dm
@@ -95,6 +95,7 @@ DEFINE_BITFIELD(smoothing_flags, list(
 #define SMOOTH_GROUP_SURVIVAL_TIANIUM_POD S_OBJ(14) ///turf/closed/wall/mineral/titanium/survival/pod, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod
 #define SMOOTH_GROUP_HIERO_WALL S_OBJ(15) ///obj/effect/temp_visual/elite_tumor_wall, /obj/effect/temp_visual/hierophant/wall
 
+#define SMOOTH_GROUP_STONE_WALLS S_OBJ(19) ///turf/closed/wall/mineral/stone, /obj/structure/falsewall/stone	// SKYRAT EDIT: Adds stone
 #define SMOOTH_GROUP_PAPERFRAME S_OBJ(20) ///obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe
 
 #define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(21) ///turf/closed/indestructible/fakeglass, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile
diff --git a/modular_skyrat/modules/stone/code/ore_veins.dm b/modular_skyrat/modules/stone/code/ore_veins.dm
new file mode 100644
index 00000000000..1cf6881889e
--- /dev/null
+++ b/modular_skyrat/modules/stone/code/ore_veins.dm
@@ -0,0 +1,134 @@
+/obj/structure/ore_vein
+	name = "ore vein"
+	desc = "An ore vein that can mined."
+	icon = 'modular_skyrat/modules/stone/icons/ore.dmi'
+	icon_state = "stone"
+	density = TRUE
+	anchored = TRUE
+	/// When we start mining, what do we tell the user they're mining?
+	var/ore_descriptor = "stone"
+	/// What type of ore do we drop?
+	var/ore_type = /obj/item/stack/ore/stone
+	/// How much ore do we drop?
+	var/ore_amount = 1
+	/// If the ore vein has been recently mined. If so, we cannot mine and must wait for it to regenerate.
+	var/depleted = FALSE
+	/// How long it takes for the ore to 'respawn' after being mined.
+	var/regeneration_time = 15 SECONDS
+	/// How long it takes for a tool to mine the ore vein.
+	var/mining_time = 3 SECONDS
+	/// How many unique sprites for ore we have, we will pick them at random.
+	var/unique_sprites = 1
+	/// If we should pick a random sprite for the ore vein or not.
+	var/random_sprite = TRUE
+	/// Our original description to hold. We'll revert to this when switching between the ore vein being depleted and not.
+	var/base_desc = ""
+
+/obj/structure/ore_vein/Initialize()
+	. = ..()
+	base_desc = desc
+	if(random_sprite == TRUE)
+		icon_state += "[rand(1, (unique_sprites))]"
+	base_icon_state = icon_state
+
+/obj/structure/ore_vein/update_icon_state()
+	. = ..()
+	if(depleted == TRUE)
+		icon_state = "[base_icon_state]_depleted"
+	else
+		icon_state = "[base_icon_state]"
+
+/obj/structure/ore_vein/examine()
+	. = ..()
+	. += "[depleted ? "The ore vein is exhausted." : ""]"
+
+/obj/structure/ore_vein/attackby(obj/item/W, mob/user, params)
+	if(W.tool_behaviour != TOOL_MINING)
+		to_chat(user, "<span class='notice'>You need a pickaxe to mine this.</span>")
+		return FALSE
+	if(!ore_type)
+		to_chat(user, "<span class='notice'>There's no ore to mine!</span>")
+		return FALSE
+	if(!ore_amount)
+		to_chat(user, "<span class='notice'>The [src] is too low quality to yield any useful amount of [ore_descriptor].</span>")
+		return FALSE
+	if(depleted == TRUE)
+		to_chat(user, "<span class='notice'>This ore vein is exhausted.</span>")
+		return FALSE
+//	Our early return checks to tell the user what went wrong.
+	to_chat(user, "<span class='notice'>You start mining the [ore_descriptor]...</span>")
+	if(W.use_tool(src, user, src.mining_time, volume=50))
+		to_chat(user, "<span class='notice'>You mine the [ore_descriptor].</span>")
+		if(ore_type && ore_amount && depleted == FALSE)
+			new ore_type(loc, ore_amount)
+		SSblackbox.record_feedback("tally", "pick_used_mining", 1, W.type)
+		depleted = TRUE
+		update_icon_state()
+		addtimer(CALLBACK(src, .proc/regenerate_ore), regeneration_time)
+		
+//	After the ore vein finishes its wait, we make the ore 'respawn' and return the ore to its original post-Initialize() icon_state.
+/obj/structure/ore_vein/proc/regenerate_ore()
+	depleted = FALSE
+	update_icon_state()
+
+/obj/structure/ore_vein/stone
+	name = "stone mine"
+	desc = "High-quality stone that once mined and refined, creates a robust construction material."
+	icon_state = "stone"
+	ore_type = /obj/item/stack/ore/stone
+	ore_amount = 1
+	unique_sprites = 2
+
+/obj/structure/ore_vein/iron
+	name = "iron mine"
+	desc = "An iron ore vein!"
+	icon_state = "iron"
+	ore_descriptor = "iron"
+	ore_type = /obj/item/stack/ore/iron
+	ore_amount = 1
+	unique_sprites = 2
+	mining_time = 5 SECONDS
+
+/obj/structure/ore_vein/silver
+	name = "silver mine"
+	desc = "Silver! In demand for more than it's beautiful lustre."
+	icon_state = "silver"
+	ore_descriptor = "silver"
+	ore_type = /obj/item/stack/ore/silver
+	ore_amount = 1
+	unique_sprites = 1
+	mining_time = 10 SECONDS
+	regeneration_time = 20 SECONDS
+
+/obj/structure/ore_vein/gold
+	name = "gold mine"
+	desc = "Precious shiny gold! A vital component for goods like electronics all the way to un-manned space vehicles."
+	icon_state = "gold"
+	ore_descriptor = "gold"
+	ore_type = /obj/item/stack/ore/gold
+	ore_amount = 1
+	unique_sprites = 2
+	mining_time = 10 SECONDS
+	regeneration_time = 20 SECONDS
+
+/obj/structure/ore_vein/plasma
+	name = "plasma mine"
+	desc = "Solid plasma! It's rather common."
+	icon_state = "plasma"
+	ore_descriptor = "plasma"
+	ore_type = /obj/item/stack/ore/plasma
+	ore_amount = 1
+	unique_sprites = 1
+	mining_time = 5 SECONDS
+	regeneration_time = 20 SECONDS
+
+/obj/structure/ore_vein/diamond
+	name = "diamond mine"
+	desc = "Diamond! It's rare and its industrial applications keep it very valuable."
+	icon_state = "diamond"
+	ore_descriptor = "diamond"
+	ore_type = /obj/item/stack/ore/diamond
+	ore_amount = 1
+	unique_sprites = 2
+	mining_time = 30 SECONDS
+	regeneration_time = 120 SECONDS
diff --git a/modular_skyrat/modules/stone/code/stone.dm b/modular_skyrat/modules/stone/code/stone.dm
new file mode 100644
index 00000000000..10dc0ddd708
--- /dev/null
+++ b/modular_skyrat/modules/stone/code/stone.dm
@@ -0,0 +1,79 @@
+/obj/item/stack/sheet/mineral/stone
+	name = "stone"
+	desc = "Stone brick."
+	singular_name = "stone block"
+	icon = 'modular_skyrat/modules/stone/icons/ore.dmi'
+	icon_state = "sheet-stone"
+	inhand_icon_state = "sheet-metal"
+	mats_per_unit = list(/datum/material/stone=MINERAL_MATERIAL_AMOUNT)
+	throwforce = 10
+//	flags_1 = null
+	resistance_flags = FIRE_PROOF
+	merge_type = /obj/item/stack/sheet/mineral/stone
+	grind_results = null
+	point_value = 0
+//	tableVariant = /obj/structure/table/stone
+	material_type = /datum/material/stone
+	matter_amount = 0
+//	cost = 500
+	source = null
+
+/datum/material/stone
+	name = "stone"
+	desc = "It's stone."
+	categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE)
+	sheet_type = /obj/item/stack/sheet/mineral/stone
+	value_per_unit = 0.005
+	beauty_modifier = 0.01
+
+/obj/item/stack/ore/stone
+	name = "unrefined stone"
+	desc = "Chunks of high-quality stone. This could be cut into bricks to form a really good building material."
+	icon = 'modular_skyrat/modules/stone/icons/ore.dmi'
+	icon_state = "stone_ore"
+	inhand_icon_state = "Iron ore"
+	singular_name = "unrefined stone chunk"
+	points = 1
+	mats_per_unit = list(/datum/material/stone=MINERAL_MATERIAL_AMOUNT)
+	refined_type = /obj/item/stack/sheet/mineral/stone
+	mine_experience = 1
+	scan_state = null
+	spreadChance = 20
+	merge_type = /obj/item/stack/ore/stone
+
+/turf/closed/wall/mineral/stone
+	name = "stone wall"
+	desc = "A wall made of solid stone brick."
+	icon = 'modular_skyrat/modules/stone/icons/wall.dmi'
+	icon_state = "wall-0"
+	base_icon_state = "wall"
+	sheet_type = /obj/item/stack/sheet/mineral/stone
+	slicing_duration = 1.5 SECONDS  //literal rock
+	explosion_block = 2
+	smoothing_flags = SMOOTH_BITMASK
+	smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_STONE_WALLS)
+	canSmoothWith = list(SMOOTH_GROUP_STONE_WALLS)
+	custom_materials = list(/datum/material/stone = 4000)
+
+/turf/closed/indestructible/stone
+	name = "stone wall"
+	desc = "A wall made of solid stone brick."
+	icon = 'modular_skyrat/modules/stone/icons/wall.dmi'
+	icon_state = "wall-0"
+	base_icon_state = "wall"
+	smoothing_flags = SMOOTH_BITMASK
+	smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_STONE_WALLS)
+	canSmoothWith = list(SMOOTH_GROUP_STONE_WALLS)
+	custom_materials = list(/datum/material/stone = 4000)
+
+/obj/structure/falsewall/stone
+	name = "stone wall"
+	desc = "A wall made of solid stone brick."
+	icon = 'modular_skyrat/modules/stone/icons/wall.dmi'
+	icon_state = "wall-0"
+	base_icon_state = "wall"
+	mineral = /obj/item/stack/sheet/mineral/stone
+	walltype = /turf/closed/wall/mineral/stone
+	smoothing_flags = SMOOTH_BITMASK
+	smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_STONE_WALLS)
+	canSmoothWith = list(SMOOTH_GROUP_STONE_WALLS)
diff --git a/modular_skyrat/modules/stone/icons/ore.dmi b/modular_skyrat/modules/stone/icons/ore.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..116a36a7c81b0392c6fd9d2999877e2463b0e5ba
GIT binary patch
literal 3370
zcmV+_4b}3AP)<h;3K|Lk000e1NJLTq005u>005u}0{{R3yb+fl0001BP)t-sz`(#Z
zH#(r8piW0nW@>AKf`UXnMp9N+NK8%0$jEq5GF2@eWIQM$BPNz)Jm$zAf>1t2BOcPK
z8Co(ew3ZZXOg84`|H#PPs;a)ba>S@bv5_sJz`(#ru>Syf$N*55k5Z*W00001bW%=J
z06^y0W&i*H*m_i0bVOxyV{&P5bZKvH004NLmDI5c!yps|&{@AilDVZxx^^iIB}4NI
zLGU#SMuSTG`?aQ_qt8v{aJlHinqB+*FtXcYpf7M<S;H>ud^}O|RwBr_=~_x8s9A<>
z;{y*6mz59Jz+@d%lnCW~JZmU<I=;ZR{!0lE4#}6;sV&l7UVmMKWRrkZLjZyEh^~p@
zW0kWeUpA?-(0tXT@S(HSBHuKrve10fqzax&={V+y5!f6)c-7o5JRkgX_+X*<Vh!SY
zcUT;qzvLZeqifcWxAd8O0GVDyl%j~ETmS$Ilu1NERCt{2oO^eoJP?Nsl@zp~NU^u0
z{r=zbol6pO4{CS&?m5gKuI(?Ehsh+6Y1qwXwbg#mgm|>RpbznAL#g(w>Y<j!({?Mw
z6MSx;{sf_@>-rHy<g0~5zIrP*H@dM@8k*bI^+Sl*Kt+@l01BkNp>m;L(w87sXo)sz
zYy$yn0Hl8x6P88~b@9Bl5HolYLLv0jK*zxtBVfH8u;d!jMe}SB6Xj~6Ypd3;FQ3q8
z3L_kRMgfx^DvciLLN*#vBrd&fkPk{ruR6_KoEUP;bAv+AABl9Fg`?*dWL+3UjPWR6
z)9_GwfHZRn5EmN$9nBcGmyCzJ(GwWY5uFjYV*4y&Q8)uSggC%kCPcukipAP%A~%Tc
z=s`1BP{edX6wi(Dn|JwKz^5l(`xGGgauc+WjWcWX7|$oPbtxL*>6#A!!->ohNNbBw
zUx?73A^BB8kKT;u1<0&}66!RC8-r&Px`0p>zXbq6oJA2Wyud>RouGthHQ&6{2*ro}
z8o*MVMF4p@)!oN#L^-`dG9kg*7FWWynX54$>a<QHpM1*3S<J(#Eup%P-zk%N)iiC}
zA|Fo@2uB-G^KEztabbLlv~R5vDM03@=b>mABy{K<r-<Q0LJN@b1TD`vg1j)M;*3^_
z6kzi#(s*fI#hs)_3Pou5$}0yyZwX$n<A8)Hl6)AbB8`{UX==2MtY*T-sYkar^8h2v
zY8Xe%JVO9}8ZWJ50Jcrjs;L|Ra$TCj8t~r7{!+cT-jL}frit%5bSy6D<;RTy^)k(O
zycl3rB_AdKu<>n9NFM4G;P3HiKw7EQ_ps2P+i#X_eiCHBU&6?m0hIq!KthxZ_}e6_
zt+v`~|Ei@^WB(8HwuAT7&Rk(hFB@(R?Cs!fR?*YuZnsMiRBC4=?k5zF+{bscA>Qv_
zUJ`^#e}wQ6K=2$VO^7gtpmij?4^ck}-4iCj_wrKLFBSVR=0r?7kS^|Zq6K(sed0sY
zK8zD8{Z2yMS0i9yCP(o#AGikzphz7S0xZ@=TsO_f3GBpJY9@!7Gi5lg%twjA8eA1k
z<ZB&sU-=$le+W=;yzPqDHR(rB+tq-$2diNSAk<#=z_H&2d`jmen5(1JhE9eP$!r)>
zQ<-ZDbrCKfIIKoIN}@^ud{u*?=ryl(bYNs(r<zuL{wRBZ0ihm!A*<HYF#s{^=<qdr
zn-E-Y>BtvsjWO@gssv)whIb5$Ps&J;(&)CW6rsMO@N1;%f4{Hj8^+~sZhY27RqJiC
zef?H`u5t5otj~avX*BC1(04BiP*MjCJBkS%KwtL&DfU!qsqwN)O11fXex-|0-#L7e
zJI62RLIW7nEkZv(*EoPWz9gq;>5(DiCtZZP^!QAmAfX0K=ms#GpHt!0HVRNQ?kp(i
za!-7r;ULd^8GTd8&rx)-;~AgscWq3M07|*n(aR%;>z#H{qZ)8^^YgxO0TcN-JLg0z
ziFd!7bsMlTfV#)sj@rQWWv_s+kkPp!{?v7rJ`<+$a|Qr^i+{yHP-`8sbdC=fP$h+E
zGV7c2i%@Q#^$tuho%-e^X>$2F2T;eERom8)P>r_>D1>Iyd{ofVJIgG61~lof;6~vC
z`j=<xxLC6X)!otn2!3S1TeAL*l(z2kv2I~#!0=wnzchD~!2hn^3SJaj50Du5_K!k(
zx&^0o4^ai@CT?6{699&~wN^U>p2-FJJto}v$m<yZSpbyx0^Vjx0@Z&>Uv0J3R$Fbg
z<<^7!Hbc((zC@VF%-q_`oqB)h`{OZJyV~sluTCYumRR2(4u?!1eLoCCT<;Gj;L8zK
z_*hO^lKc6f{ln>yb`t1AH^g+!mn5uazFm;|T8M`|Ku4#96ImbN!8vpyR_l-OF+!Or
zA8xt!`)UV#PHJp9op!(pECihO0T5$=#P>Rm!{LzPg8)<s<tT%BmW<(X?}x)U0!m1z
z^sXa4AncDl@tu$_a(xx1FPTr}lVfxyEfFwkx)XIVVQ+m{f;VkZo%qRt!|4<WL-HKP
zpWeRiy@^6}&)NXd(GQ2?aU2N`hG?9oAk<OUd=VY^;CIXiQh)LWnaS!}n0&mu)PRm$
zeCmu49UZT{KaPwyk$D6#q{mUYFQy~^I39ryy*q#xT|(GrV{RM&R-y3f#@Dx&J==QE
zp6kc))$k#K1%PNhy3o?Q&gPp&A|wgI@bz?Z`=1FZ+l^V+K;P=auCC6pO)jL-qmOB{
ze85BN>75Or_*elOfY1kQ>OBJP;Y*NRU|r|AJ$>pic!2OYs>`QtUJYTdW{0CYd>hTj
z{6u*2`v)KG_l?jwPCxfWKCDe9)Y7L3rsV7E>2<&kG#>(<W*q??JphC|;LL|V+JLG@
z1TchlYRS@Npktfhq}NyKVi@!==`d0{0NQ%z5E9=o>hYz5mTae8ErNyms2gR|d}uk{
zAyiOSNmW?`SZgpl3-jR%b*ppJKYz{Z7NO>I3fh1w6=Io_TFUEgvz8ZPfDt{oh5%5`
z*&5Tk4Oq}U4_TwMOuqq;8O+zEdaQZ7hmu|dj3>b4V*PQzND*6&6383$C_%wN9)VxP
zRaaYWwbfSpXYAk4&;73TLoPq}`|SPDW%6_V`R(oP{^aBjnC6QUA|G^re#<5&VRQb+
z2r+F(+ru%Mp2GotXD_B&7zWIqW(Yq%KTG&STIv;_x8pN>!1jLZ`!wM=bd**}5(3}n
zu@D1YvNq-CIJ+}+p?W4h9DcNO3=jCUp5pr&F=dlRq~S~Gy~^JWalSXj$6MaFvx|s(
za^_<_Y=JuX8dX{=hJgFfF0FHZj`)Tk20?s#f5*zxcs>Kb``g>u(L2@nL<y`IAa=m1
znU9ZH5*kxWoys}Hbd{eQRDRAEb<S);SHAg#md+{4E+8~~A0IH(!|@}fQv=~32Kl+p
z6|L+TjP*Mbo)fwv^t!-?KR%ETX3E#_`S}s*FbFCM8vzXRbDdLpG&W7|bP@08l-?;<
zdi|5<#)0_8FAwm@7lsoc$`{Me&4uP<%X|qySkRqLfbSFepy1aR{_{1t{ZBeSH_$%;
zVKzTESt+Nv$h27JOBfk&)cKh}XF#R<A(G9{Sy?CQUv;rq*8}wRIa)RaIxPUkT*7RA
zF6jS8o%+Y$eCcbazNSF$5_%~=H%9uuMc+(wh#G>y0nF>A?2;W};~lzPV6X@l>q`Oe
z)gN!51Q?Z<>puWk$j_DXizWT>21@z4Qhu?dKi<G<tF5-$YX69pj=nv7H10tw9nSlK
z!+Q@|b;+O2!#5+7dWrl8uB^IT>Fisop-OaVy}Dd3S?7zpU%mGEQiPf>rdLq;O7GDp
z+J?#^qc7xxF5pAP4>&>>00_HR8Oq?k>-C%68$+n*U7NJN6p;A7r4*M-L|1$Q^hjOB
z$N!C7q^^1aHm)z?gNn#^MLzIlRLAW<=>EPRuMJ;gx?BuHaBZk}U7d@e5+E2kP+YH(
zCP*g-hJ48003Tf5_4}I{BD#9#>%KFxc<iaJnGZd1y~K3l6Mp*@o#~QNUdbRv;8HIU
zT@lJi6c??=6JxRlzJ~rA&Z|eLbfNT+k6)eq{zkwWWAYl)8L+Ox1Y(hok2}?>A@MzT
z5Y?>?D)Y)RmiYz;5}%1<7*tC~2UcB>KP&?37ii5Zq~F)PK6ijCQ)3_MsuiFK<j&W5
zsBZx@FZk+%V=%}CUAIpY3jxeaytEj=T&c|Yxz5$qT)AZ~H|CAf`S{a9ou`E%K#Aru
zz6NXnU7h%By=>}*P4kMdzZz$B;!}j`<P^D2&L<2p?rfdhCuQ#C#sF|WJ7x}PE!5}1
zZ@fcZx(L6|oYrsPOPzhn>iY1WM_`J~uQSK>#ekW^Sy^45)^i+e6)EX|3sCsodw@y(
zj{_!OZ<P!6`v~Q7{civUjrf(bdYqu-;zfM_0fmh`E2AZkYybcN07*qoM6N<$f^ms%
A-~a#s

literal 0
HcmV?d00001

diff --git a/modular_skyrat/modules/stone/icons/wall.dmi b/modular_skyrat/modules/stone/icons/wall.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..7cd20b77d14f1da955dd1fa36d82938fc4ed6459
GIT binary patch
literal 3060
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
UF)Dsa@G}>(G_^7*#5t4y17Y^}IRF3v

literal 0
HcmV?d00001

diff --git a/tgstation.dme b/tgstation.dme
index 34145743242..3fe16b2e8a3 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4272,6 +4272,8 @@
 #include "modular_skyrat\modules\specborg\code\game\objects\items\cyborg_items.dm"
 #include "modular_skyrat\modules\specborg\code\modules\living\sillicon\robot\robot_module.dm"
 #include "modular_skyrat\modules\ssd_indicator\code\mob.dm"
+#include "modular_skyrat\modules\stone\code\ore_veins.dm"
+#include "modular_skyrat\modules\stone\code\stone.dm"
 #include "modular_skyrat\modules\stock_market\code\articles.dm"
 #include "modular_skyrat\modules\stock_market\code\computer.dm"
 #include "modular_skyrat\modules\stock_market\code\computer_circuitboards.dm"