Skip to content

Commit

Permalink
Merge pull request #4709 from MistakeNot4892/feature/misc_items
Browse files Browse the repository at this point in the history
Several small items from blacksmithy PR.
  • Loading branch information
out-of-phaze authored Jan 14, 2025
2 parents bab2ce3 + 3fdea92 commit 3797c21
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 1 deletion.
9 changes: 9 additions & 0 deletions code/game/objects/items/artifice/chain.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Stub for forging. TODO crafting that uses chains.
/obj/item/chain
name = "chain"
name_prefix = "length of"
desc = "A flexible length of interconnected links forming a chain."
icon_state = ICON_STATE_WORLD
icon = 'icons/obj/items/chain.dmi'
material = /decl/material/solid/metal/iron
material_alteration = MAT_FLAG_ALTERATION_ALL
8 changes: 8 additions & 0 deletions code/game/objects/items/artifice/hook.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Stub for forging. TODO use for slapcrafting a fishing rod?
/obj/item/hook
name = "hook"
desc = "A small, sharp, curved object."
icon_state = ICON_STATE_WORLD
icon = 'icons/obj/items/hook.dmi'
material = /decl/material/solid/metal/iron
material_alteration = MAT_FLAG_ALTERATION_ALL
12 changes: 12 additions & 0 deletions code/game/objects/items/chisel.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Stub for forging. TODO implement TOOL_CHISEL.
/obj/item/tool/chisel
name = "chisel"
desc = "A hard, sharpened tool used to chisel stone, wood or bone."
icon_state = ICON_STATE_WORLD
icon = 'icons/obj/items/tool/chisel.dmi'
material = /decl/material/solid/metal/steel
handle_material = /decl/material/solid/organic/plastic
binding_material = null

/obj/item/tool/chisel/forged
handle_material = null
8 changes: 8 additions & 0 deletions code/game/objects/items/horseshoe.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Stub for forging. TODO implement shoes on honse.
/obj/item/horseshoe
name = "horseshoe"
desc = "A curved length of metal, usually nailed to a horse's hoof. May bring luck."
icon_state = ICON_STATE_WORLD
icon = 'icons/obj/items/horseshoe.dmi'
material = /decl/material/solid/metal/iron
material_alteration = MAT_FLAG_ALTERATION_ALL
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ var/global/list/_tool_crafting_lookup
return global._tool_crafting_lookup

var/global/list/_tool_crafting_components = list(
/obj/item/tool/chisel = list(
/obj/item/tool_component/head/chisel,
/obj/item/tool_component/handle/short
),
/obj/item/tool/hammer = list(
/obj/item/tool_component/head/hammer,
/obj/item/tool_component/handle/short
Expand Down
6 changes: 5 additions & 1 deletion code/modules/tools/components/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ var/global/list/_tool_properties_cache = list()
desc = "The head of a hoe."
icon_state = "hoe"

/obj/item/tool_component/head/chisel
name = "chisel head"
desc = "The head of a chisel."
icon_state = "hoe"

/obj/item/tool_component/head/handaxe
name = "hand axe head"
desc = "The head of a hand axe."
Expand All @@ -57,4 +62,3 @@ var/global/list/_tool_properties_cache = list()
desc = "The head of a sledgehammer."
icon_state = "sledgehammer"
w_class = ITEM_SIZE_NORMAL

Binary file added icons/obj/items/chain.dmi
Binary file not shown.
Binary file added icons/obj/items/hook.dmi
Binary file not shown.
Binary file added icons/obj/items/horseshoe.dmi
Binary file not shown.
Binary file added icons/obj/items/tool/chisel.dmi
Binary file not shown.
4 changes: 4 additions & 0 deletions nebula.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1079,6 +1079,7 @@
#include "code\game\objects\items\bodybag.dm"
#include "code\game\objects\items\buttons.dm"
#include "code\game\objects\items\candelabra.dm"
#include "code\game\objects\items\chisel.dm"
#include "code\game\objects\items\christmas.dm"
#include "code\game\objects\items\contraband.dm"
#include "code\game\objects\items\crutches.dm"
Expand All @@ -1087,6 +1088,7 @@
#include "code\game\objects\items\fleece.dm"
#include "code\game\objects\items\glassjar.dm"
#include "code\game\objects\items\holosign_creator.dm"
#include "code\game\objects\items\horseshoe.dm"
#include "code\game\objects\items\hourglass.dm"
#include "code\game\objects\items\instruments.dm"
#include "code\game\objects\items\latexballoon.dm"
Expand All @@ -1108,6 +1110,8 @@
#include "code\game\objects\items\trash.dm"
#include "code\game\objects\items\umbrella.dm"
#include "code\game\objects\items\waterskin.dm"
#include "code\game\objects\items\artifice\chain.dm"
#include "code\game\objects\items\artifice\hook.dm"
#include "code\game\objects\items\blades\_blade.dm"
#include "code\game\objects\items\blades\axe.dm"
#include "code\game\objects\items\blades\axe_fire.dm"
Expand Down

0 comments on commit 3797c21

Please sign in to comment.