Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a forging hammer as prep for blacksmithy. #4710

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ var/global/list/_tool_crafting_components = list(
/obj/item/tool/axe = list(
/obj/item/tool_component/head/handaxe,
/obj/item/tool_component/handle/short
),
/obj/item/tool/hammer/forge = list(
/obj/item/tool_component/head/forging_hammer,
/obj/item/tool_component/handle/short
)
)

Expand Down
5 changes: 5 additions & 0 deletions code/modules/tools/components/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,8 @@ var/global/list/_tool_properties_cache = list()
icon_state = "sledgehammer"
w_class = ITEM_SIZE_NORMAL

/obj/item/tool_component/head/forging_hammer
name = "forging hammer head"
desc = "The head of a forging hammer."
icon_state = "forging"
w_class = ITEM_SIZE_NORMAL
15 changes: 15 additions & 0 deletions code/modules/tools/subtypes/hammers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,18 @@
TOOL_SHOVEL = TOOL_QUALITY_DECENT
)
return tool_qualities

/obj/item/tool/hammer/forge
name = "forging hammer"
desc = "A heavy hammer, used to forge hot metal at an anvil."
icon = 'icons/obj/items/tool/hammers/forge.dmi'
w_class = ITEM_SIZE_NORMAL

// Forging hammers are not great at general hammer tasks (too heavy I guess),
// and also don't work as crowbars due to missing the nail ripper/flange,
// but will be more effective at forging when blacksmithy is merged.
/obj/item/tool/hammer/forge/get_initial_tool_qualities()
var/static/list/tool_qualities = list(
TOOL_HAMMER = TOOL_QUALITY_MEDIOCRE
)
return tool_qualities
Binary file modified icons/obj/items/tool/components/tool_head.dmi
Binary file not shown.
Binary file added icons/obj/items/tool/hammers/forge.dmi
Binary file not shown.