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

Hearthkin Part Two: Now Fully Functional #63

Merged
merged 33 commits into from
Sep 20, 2024
Merged

Hearthkin Part Two: Now Fully Functional #63

merged 33 commits into from
Sep 20, 2024

Conversation

MortoSasye
Copy link

@MortoSasye MortoSasye commented Sep 19, 2024

About The Pull Request

Adds the Hearthkin's hearth and related objects, etc, finally.

Updated some sprites while I was at it too.

More pr's will follow unavoidably to add bits and details here and there.

Full Map:

image

image

Key areas:

image

image

image

image

image

image

image

Why It's Good For The Game

WE HAVE OUTLANDERS TO K*LL, KIN

Changelog

🆑 MortoSasye And Kaostico
add: Added a fully functional Hearthkin's Hearth.
add: Added Hearthkin related ruins: Abandoned Hearth, Ancient Temple, Magical Hot Springs.
add: Added the catnip plant and honeysuckle plant.
add: Added saunas to the game.
add: Added primitive tools, including surgery ones.
add: Added towels and towel bins to the game.
add: Added exclusive hearthkin recipes: fur rugs, bronze calling horn, and the warning rune stone.
add: Added the automapper system, and its unit test.
fix: Linter now checks on modular_doppler if dm files aren't included on tgstation.dme
fix: Linter now works on unit test's subdirectories correctly
image: Updated the sprites for the tailored dress, the tunic, and the ferroniere.
/:cl:

@github-actions github-actions bot requested a review from carpotoxin September 19, 2024 19:45
@MortoSasye
Copy link
Author

Hold off on merging this, adding some more stuff while I see if #21 gets accepted during that period.

@MortoSasye
Copy link
Author

DO NOT MERGE. There's a game breaking bug re: crafting that is becoming a fucking nuisance to find, and it's getting late on our side.

Added:

  • A calling horn, which will become functional later. *
  • A rune stone warning people to not invade the hearth. *
  • Fur rugs for decoration, that work as structures. *
  • Capes are now found in the wardrobe.
  • Crafting recipes included, exclusively for hearthkin.

dreamseeker_F6KZeSxMh7
dreamseeker_Lrw2HPHfGV
dreamseeker_Qlqfj9U1pO
dreamseeker_Hl4hyRNBKl
dreamseeker_1vPgdZtqxe

@MortoSasye
Copy link
Author

Ok now it can be merged, we have finished fist fighting this code for now.

Added functions to deconstruct the new items, as well as anchor/un-anchor the horn and the stones with ctrl + click

dreamseeker_XvbbvsZoXP
nVpyD8m9Sv
dreamseeker_eSysHnFD7u
dreamseeker_o7nyX7XAI8
dreamseeker_kAedz4Njjz
dreamseeker_3BPFcFUEkT
dreamseeker_8GDx1rkaDu
VQnrJFrm75

@carpotoxin
Copy link
Collaborator

I blow my bugle.

@carpotoxin carpotoxin merged commit 3c62d82 into DopplerShift13:master Sep 20, 2024
20 checks passed
@MortoSasye MortoSasye deleted the hearthkin-part-two branch September 20, 2024 20:26
@SylvetteSylph SylvetteSylph added the Mapping Map Related label Sep 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mapping Map Related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants