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.

Sign up for GitHub

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

Jump to bottom

Various rock and crafting tweaks. #3808

Merged
merged 2 commits into from
Mar 20, 2024
Merged

Various rock and crafting tweaks. #3808

merged 2 commits into from
Mar 20, 2024

Conversation

MistakeNot4892
Copy link
Contributor

Description of changes

  • Rocks are now a material stack.
  • Single natural walls no longer have no icon on Initialize().
  • Mining requires a pickaxe with hardness greater than the target turf.
  • Tool head crafting requires rocks or planks depending on the tool head.
  • Stack crafting recipes or stacks themselves can have verbs specified for crafting messages.

Why and what will this PR improve

Various stuff to make toolmaking and mining more entwined.

Authorship

Myself.

Changelog

🆑
tweak: Mining now requires a tool of sufficient hardness.
tweak: Tool crafting is now restricted to specific stack types.
/:cl:

@MistakeNot4892 MistakeNot4892 changed the title Tweak/rockstack Various rock and crafting tweaks. Mar 18, 2024
@MistakeNot4892 MistakeNot4892 added the ready for review This PR is ready for review and merge. label Mar 18, 2024
out-of-phaze
out-of-phaze requested changes Mar 18, 2024
View reviewed changes
code/game/objects/items/rock.dm Outdated Show resolved Hide resolved
code/modules/materials/_materials.dm Outdated Show resolved Hide resolved
code/modules/tools/archetypes/tool_extension_variable.dm Outdated
@@ -44,6 +44,6 @@
var/tool_name = tool_archetype.name
if(tool_archetype.article)
tool_name = "\a [tool_name]"
to_chat(user, SPAN_NOTICE("You adjust \the [holder] to function as [tool_name]."))
to_chat(user, SPAN_NOTICE("You adjust your grip on \the [holder] to use it as [tool_name]."))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the original idea here was something like changing a drill's bit from 'drill' to 'screwdriver' or what have you? Still, this message does work better for non-mechanical tools. I kind of think maybe the variable tool extension just shouldn't be used for those... could make it contextual and pop up a radial menu if it has two? Then again, that could make IS_TOOL blocking so you'd have to do it delicately...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh you're right, I thought this was separate to the powertools but it's all the same extension type.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per Discord this isn't something I can really do in this PR.

@MistakeNot4892 MistakeNot4892 force-pushed the tweak/rockstack branch 2 times, most recently from 54b2ea9 to 0cd0f4f Compare March 18, 2024 03:27
out-of-phaze
out-of-phaze previously requested changes Mar 18, 2024
View reviewed changes
code/game/objects/items/weapons/surgery_tools.dm Outdated
@@ -179,7 +179,7 @@

/obj/item/incision_manager/Initialize()
. = ..()
set_extension(src, /datum/extension/tool/variable, list(
set_extension(src, /datum/extension/tool/variable/simple, list(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
set_extension(src, /datum/extension/tool/variable/simple, list(
set_extension(src, /datum/extension/tool/variable, list(

This is a digital tool, isn't it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I must have find and replace'd that one.

out-of-phaze
out-of-phaze previously approved these changes Mar 19, 2024
View reviewed changes
@MistakeNot4892
Rocks are now stacks.
01e9ab5 
Expanding/refining rock crafting.

Fixes runtime with rock turfs.

Fixing issues with boulders.

Tweaking forage boulders.

Tweaks and adjustments to rockstack PR. TODO squash merge.
@MistakeNot4892
More rock fixes.
16ba1ce
out-of-phaze
out-of-phaze approved these changes Mar 20, 2024
View reviewed changes
Copy link
Member

@out-of-phaze out-of-phaze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict resolution, so it's been 24hrs.

@out-of-phaze out-of-phaze merged commit 3717bb8 into NebulaSS13:dev Mar 20, 2024
11 checks passed
NebulaSS13Bot added a commit that referenced this pull request Mar 20, 2024
@NebulaSS13Bot
Automatic changelog generation for PR #3808 [ci skip]
bb9b90e
@out-of-phaze out-of-phaze mentioned this pull request Apr 19, 2024
Closed
5 tasks
@MistakeNot4892 MistakeNot4892 deleted the tweak/rockstack branch May 23, 2024 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@out-of-phaze out-of-phaze out-of-phaze approved these changes

Assignees
No one assigned
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MistakeNot4892 @out-of-phaze