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

Adds blacksmithy #4672

Merged
merged 1 commit into from
Feb 2, 2025
Merged

Conversation

MistakeNot4892
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 commented Dec 22, 2024

Description of changes

This is a partial implementation of blacksmithy and metalworking to bracket the existing low-tech crafting systems like casting.

image

Longer-term TODO (not in this PR)

  • Update bladed weapons to be crafted like tools, by combining handle and blade blank.
  • Implement quenching/hardening and grinding/polishing as final steps after producing the blanks.
  • Implement barrel, chest and armour fittings.
  • Implement barrel crafting.
  • Implement nails/uses for nails.
  • Move metal crafting recipes off stacks and onto either the autolathe, forging or both.
  • Add anvil forging (ingots on an anvil instead of a billet?)
  • Punch up the forging strings and messages to be less brusque.
  • Find icons for armor, helmet, blade blanks.

Why and what will this PR improve

  • Implements a metalworking minigame to replace using psychic powers and spaceman bare hands to turn ingots into things.
  • Clang clang clang clang.

Authorship

Code is mine, icons and a lot of the design work belong to @PlayerDeer.

Changelog

🆑
feature: Added blacksmithing!
/:cl:

@MistakeNot4892 MistakeNot4892 added the work in progress This PR is under development and shouldn't be merged. label Dec 22, 2024
@MistakeNot4892 MistakeNot4892 force-pushed the feature/blacksmithy branch 3 times, most recently from 974c8dc to cce8d61 Compare December 22, 2024 14:44
code/game/objects/objs.dm Outdated Show resolved Hide resolved
code/modules/crafting/forging/forge_anvil.dm Outdated Show resolved Hide resolved
@MistakeNot4892 MistakeNot4892 force-pushed the feature/blacksmithy branch 5 times, most recently from 8bdccc7 to 496142b Compare January 1, 2025 13:15
@out-of-phaze out-of-phaze dismissed their stale review January 3, 2025 05:15

premature review

@MistakeNot4892 MistakeNot4892 added the has dependencies This PR should not be merged prior to any PRs linked in body or comments. label Jan 9, 2025
@MistakeNot4892
Copy link
Contributor Author

MistakeNot4892 commented Jan 9, 2025

Breaking this up a bit for ease of workflow/review:
#4709, #4710, #4711, #4712, #4713

@MistakeNot4892 MistakeNot4892 force-pushed the feature/blacksmithy branch 5 times, most recently from fdc5618 to 85b0150 Compare January 9, 2025 23:57
@MistakeNot4892 MistakeNot4892 force-pushed the feature/blacksmithy branch 3 times, most recently from 2874159 to c10466d Compare January 22, 2025 00:49
@MistakeNot4892 MistakeNot4892 removed the has dependencies This PR should not be merged prior to any PRs linked in body or comments. label Jan 22, 2025
@MistakeNot4892 MistakeNot4892 force-pushed the feature/blacksmithy branch 5 times, most recently from d8ccb74 to e597eae Compare January 23, 2025 07:37
@MistakeNot4892
Copy link
Contributor Author

I am flagging on this one a bit. It's basically ready to go other than some balancing around how long billets retain heat, and getting a better sound effect for the forging. Plus icons for the various blanks.

@MistakeNot4892 MistakeNot4892 marked this pull request as ready for review January 23, 2025 08:16
@MistakeNot4892 MistakeNot4892 added the help wanted Extra attention is needed label Jan 23, 2025
@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. and removed help wanted Extra attention is needed work in progress This PR is under development and shouldn't be merged. labels Jan 24, 2025
@MistakeNot4892
Copy link
Contributor Author

Happy with where this is sitting now, other stuff can be a follow up.

@MistakeNot4892 MistakeNot4892 force-pushed the feature/blacksmithy branch 5 times, most recently from c23f1cf to 3717b90 Compare January 24, 2025 07:46
@MistakeNot4892 MistakeNot4892 changed the title Working draft of blacksmithing. Adds blacksmithy Jan 24, 2025
@MistakeNot4892 MistakeNot4892 added has dependencies This PR should not be merged prior to any PRs linked in body or comments. and removed ready for review This PR is ready for review and merge. labels Jan 28, 2025
@MistakeNot4892
Copy link
Contributor Author

Depends on #4802

@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. and removed has dependencies This PR should not be merged prior to any PRs linked in body or comments. labels Jan 30, 2025
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.

note to self add smithing stuff to karzerfeste

@out-of-phaze out-of-phaze merged commit 72752db into NebulaSS13:dev Feb 2, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants