From d1ccca695ba4a11b118b3590de90489d698c4cf8 Mon Sep 17 00:00:00 2001
From: MistakeNot4892 <AGMogett@gmail.com>
Date: Thu, 2 Jan 2025 00:30:30 +1100
Subject: [PATCH] Implementing skeletal versions of grindstone and bellows.

---
 code/modules/crafting/forging/bellows.dm      |  13 ++++++++++
 code/modules/crafting/forging/grindstone.dm   |  16 ++++++++++++
 code/modules/materials/material_stack_nail.dm |  23 +++++++++---------
 icons/obj/structures/forging/bellows.dmi      | Bin 842 -> 848 bytes
 icons/obj/structures/forging/grindstone.dmi   | Bin 886 -> 914 bytes
 nebula.dme                                    |   2 ++
 6 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 code/modules/crafting/forging/bellows.dm
 create mode 100644 code/modules/crafting/forging/grindstone.dm

diff --git a/code/modules/crafting/forging/bellows.dm b/code/modules/crafting/forging/bellows.dm
new file mode 100644
index 00000000000..d8a23195d20
--- /dev/null
+++ b/code/modules/crafting/forging/bellows.dm
@@ -0,0 +1,13 @@
+/obj/structure/working/bellows
+	name = "bellows"
+	desc = "An air pump used to improve the heat of a furnace."
+	icon = 'icons/obj/structures/forging/bellows.dmi'
+	var/decl/material/bellows_material = /decl/material/solid/organic/leather
+
+/obj/structure/working/bellows/Initialize()
+	bellows_material = GET_DECL(bellows_material)
+	. = ..()
+
+/obj/structure/working/bellows/on_update_icon()
+	. = ..()
+	underlays = list(overlay_image(icon, "[icon_state]-bellows", bellows_material.color, RESET_COLOR))
diff --git a/code/modules/crafting/forging/grindstone.dm b/code/modules/crafting/forging/grindstone.dm
new file mode 100644
index 00000000000..1c25de18e84
--- /dev/null
+++ b/code/modules/crafting/forging/grindstone.dm
@@ -0,0 +1,16 @@
+/obj/structure/working/grindstone
+	name = "grindstone"
+	desc = "A rotating section of coarse stone used to polish and sharpen metalwork like blades."
+	icon = 'icons/obj/structures/forging/grindstone.dmi'
+	var/decl/material/stone_material = /decl/material/solid/stone/granite
+
+/obj/structure/working/grindstone/Initialize()
+	stone_material = GET_DECL(stone_material)
+	. = ..()
+
+/obj/structure/working/grindstone/on_update_icon()
+	. = ..()
+	underlays = list(
+		overlay_image(icon, "[icon_state]-grindstone", stone_material.color, RESET_COLOR),
+		overlay_image(icon, "[initial(icon_state)]-backdrop")
+	)
diff --git a/code/modules/materials/material_stack_nail.dm b/code/modules/materials/material_stack_nail.dm
index a989de40b89..fb0efb77882 100644
--- a/code/modules/materials/material_stack_nail.dm
+++ b/code/modules/materials/material_stack_nail.dm
@@ -1,15 +1,16 @@
 /obj/item/stack/material/nail
-	name = "nails"
-	singular_name = "nail"
-	plural_name = "nails"
-	icon_state = "nail"
-	plural_icon_state = "nail-mult"
-	max_icon_state = "nail-max"
-	stack_merge_type = /obj/item/stack/material/nail
+	name                = "nails"
+	singular_name       = "nail"
+	plural_name         = "nails"
+	icon_state          = "nail"
+	plural_icon_state   = "nail-mult"
+	max_icon_state      = "nail-max"
+	stack_merge_type    = /obj/item/stack/material/nail
 	crafting_stack_type = /obj/item/stack/material/nail
-	icon = 'icons/obj/items/stacks/nails.dmi'
-	is_spawnable_type = TRUE
-	matter_multiplier = 0.05 // 20 per standard sheet
+	icon                = 'icons/obj/items/stacks/nails.dmi'
+	is_spawnable_type   = TRUE
+	matter_multiplier   = 0.05 // 20 per standard sheet
+	material            = /decl/material/solid/metal/iron
 
 /obj/item/stack/material/nail/twelve
-	amount = 12
+	amount              = 12
diff --git a/icons/obj/structures/forging/bellows.dmi b/icons/obj/structures/forging/bellows.dmi
index bcee8e6440667a1418f86be18ed576ab84d5da05..9e6031422efe43c048341449eab4a39b0e43af16 100644
GIT binary patch
delta 104
zcmV-u0GI#D2G9nOQUREeQ%G2;JijO>MTv_uC9|j)$T#HTOe;#vO@**gRp}<B=H%p;
z7Za%(NM>i|rDIoZ0u)WnNvs43>wqB_XHjZ-W?l*&qwqU`fRV}yu6{1yAOZkgvQ?9+
K{2nv0?Og&iq%67s

delta 98
zcmV-o0G<EP2FeDIQUQ{YQ%F+DDK#f2zr0w%Cl#nuiHkEOv#1y-Zpg)%R+N~V3SpzG
zCRQE9R0YSp%-qBhpsTR!GXaXG<|I~vgmu6W(;(7~P*!mDa{&hl04Bgt)#=PjezEgi
E0#Ax8WB>pF

diff --git a/icons/obj/structures/forging/grindstone.dmi b/icons/obj/structures/forging/grindstone.dmi
index c7b0c5fc18a9ab007fb8892909cab3f5b00d0ff6..70b311b63b5c8f68854a03a206211bdc316f508c 100644
GIT binary patch
delta 822
zcmV-61IhgM29gJmBrg?EOjJd{z`%-%p2ES&Nk?4&|NmuTcEG^EA{7e200001bW%=J
z06^y0W&i*HpOH{Vf2lmbC?`dUi!&v&s2IpM<l;;#O3Y1#uu)a%0?F*mymaiUEr6n_
zIf<1ZVI7Jfy0uA($=NAI`2|F}GQB7>FQvF7KQEOuZxPgp+lO4r3a)-G;P3|k`(A5m
zW1##B0007jNkl<ZXo2mQ!E)Om5J0!Kdk<)I7l;p#M0(F)fA?PO`2T;UKod*5NXQC0
zWIDXt0~=coGy4KiC=?2X!hUc8a0K`vU$R_$Iw%7$ba1#dIewC#9u`i3U$EWH!@1T{
zDk)n%ynNl&!$I}c#dBt_&DUK%9CY7mZM4>0cZ>c?U0qt_?PDK?zU5L%QSqVM;IduV
zhkmF8Q$n_)fA1FEy#+hnA06~iX|3ENiH}E^b3L4~)BVxiN3`yjb$62|+^rC&`=i6)
z7NlE{-LkuDcg9ZlM~7dxe+&06>2hWN;e|q>5b$#uCUZI)KSp6PR=?eWVJ^#YPG>{s
zbT(lw>v3*p6Xvp*%;j97xjfT*&6Yll=d%B^OVoREe^VbubJ@SZpx!$*Tl$dB<#3M-
z?me@i52Lvp?vWwAr=IV_h;WZ2=|6?seWT@Gj0pG0BzsU@61^C))_ZgAZ}NEW=p(Q6
z-kd9R@1n1`(tEKV-liV^h%3DpyFwoEWFL-xZIBlVh5s1Y?CclQ?CA$L#LSNFM)&<X
z&Ba^?e{*N`^=&^t{AQfhCgnA8mU1}Q+TPhU=?pu=&XB{&x)uALaN*uS_K`E>@RPHf
zW%aT%yW;ruaAa)gS+(pnah~4y2e?nD5^gs+K==**BwP@;X@}k)&~5OVIJeiS`)5So
zc-;l@8o4VfR&{&2TiMwQg+ih5L2eI5=VkUFd?mXFDcL<p$?ZYPTJL!miC&BkBz-sM
zHF94HS6GDhU2s9%E_(#+yWsYDkC^SlnmAwHpF8koIq5^Y;w*7s=sQdLP!Om4s0S&%
zuYTNv)az6)MjYM$C8^$9>&2M-9*j;bJ@|e23nyG7u#3Dt7ytkO07*qoM6N<$f|o&^
AivR!s

delta 794
zcmV+#1LgdZ2lfV#BrFn8OjJd{z`%-%p2ES&|Ns9<M_grMcCig+F#rGn0d!JMQvg8b
z*k%9#0H={tNPo$_C^IjmxFkO>RUte-KSjYQF*#d_i!&v&s2C`1$i<mfl$e_eVPnxm
zf>H&?yv*Fh5}@O-Yq9`}rsgD8f`oNYAa2*X73JrZkm3fPRA2y+tbqcjD=WDAxqxE^
z0GE_`dl;3H=l}o$Ur9tkRA_<in89|NFc3wlarYe^w0}o}56FRb50vgJH~#-$sc>wg
znNa{mS@iVG+mI{JLn4dZs3;^7$^Q~%ZkI3i+d5`z{7e!z-R*Mf*FoENXhs_I!c*V(
zUGRJwt9iCd+If2Hx#_N#V7-alj8(tnJN$f%byv`rmvurK&tp5^qUPbggCC$kuX~8F
zCJX^jV}Glxv8GbfqtI!0h08i2!hjh99;eEHGPX72y|8rtdH3fzfwS=i<o?R@RK0E4
zJhuE*!K(xPoWK~|CXemya#r`g;tVj2P(2@DtO+a3)4k9Jh5n7Gkg(h2U$1Y&*GFNo
zd=mKme1Nkd>@c&8OTm!98Z(REW3YoGY!LIzP=5_M9BCZ#SR#=~B==<bV2rbTkaM07
za?bQY&Y3>QnfToyHXFX^{SE;8-ac!@%3T8Xeh0+&B5Vk|_u2a$^}h(a<IH_8=7*ZF
zdjEdJ_xu|bVYkD`mZ;y|oSOKdAx!ThKOC3e(h%@s{UHNT)?2>l*Q|-}DZ=#rwlC)U
zAb<D6Tptualt?5JiR2$m>>T?{o=M`!Id(A(ctR4#3QMwr6pox@=M_fIvGWS~Ikrzn
zCQxRD&HBOkIkt}_6DXf*!gl?Cl%He!G^BtsdqWU@j(w!?^g>70uygDqg^`hG*g1Bw
z{|z^n$j`A4W#cPKBoc{4@`>?&R}&6WCu94f_q!4m+5u6rFM9dGI)tgLQ*Ep$@dBxB
zb?JrV&o(J6sd(%c;sr7-z=hWCy`VS|rh<v@H~qf*<c0cYb~fDZL)o&=59QMrSg$|-
Y1(>6&1vQZG(EtDd07*qoM6N<$f;kqEZU6uP

diff --git a/nebula.dme b/nebula.dme
index dae5137dd54..8d940eaef24 100644
--- a/nebula.dme
+++ b/nebula.dme
@@ -2216,6 +2216,7 @@
 #include "code\modules\codex\entries\weapons.dm"
 #include "code\modules\crafting\handmade_fancy.dm"
 #include "code\modules\crafting\handmade_items.dm"
+#include "code\modules\crafting\forging\bellows.dm"
 #include "code\modules\crafting\forging\forge_anvil.dm"
 #include "code\modules\crafting\forging\forge_bars.dm"
 #include "code\modules\crafting\forging\forge_billet.dm"
@@ -2223,6 +2224,7 @@
 #include "code\modules\crafting\forging\forge_tools.dm"
 #include "code\modules\crafting\forging\forging_action.dm"
 #include "code\modules\crafting\forging\forging_step.dm"
+#include "code\modules\crafting\forging\grindstone.dm"
 #include "code\modules\crafting\metalwork\metalwork_items.dm"
 #include "code\modules\crafting\pottery\pottery_moulds.dm"
 #include "code\modules\crafting\pottery\pottery_structures.dm"