Skip to content
New issue

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

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

Already on GitHub? # to your account

Sect of the hunt #4057

Merged
merged 27 commits into from
Nov 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
91e0481
Initial backup of the atlatl and hunter pinpointer
MissClassyPineapple Nov 1, 2024
fafa984
Merge branch 'Monkestation:master' into Sect-of-the-Hunt
MissClassyPineapple Nov 1, 2024
8157943
Spear quiver initial sprite
MissClassyPineapple Nov 2, 2024
f5f5d2b
Merge branch 'Sect-of-the-Hunt' of https://github.com/MissClassyPinea…
MissClassyPineapple Nov 2, 2024
4bd58d6
Merge branch 'Monkestation:master' into Sect-of-the-Hunt
MissClassyPineapple Nov 2, 2024
d53357d
Atlatl weapon finalised for initial testing.
MissClassyPineapple Nov 2, 2024
43ac484
a single checkmark changed
MissClassyPineapple Nov 2, 2024
c1c3250
dmis fully finished for atlatl and the spearquiver
MissClassyPineapple Nov 3, 2024
cffe40b
Sect of the Hunt rites ready for testing
MissClassyPineapple Nov 4, 2024
b51ca31
Silly file not being the correct type.
MissClassyPineapple Nov 4, 2024
f4d404a
Merge branch 'Monkestation:master' into Sect-of-the-Hunt
MissClassyPineapple Nov 4, 2024
71daa01
Ready for testmerge
MissClassyPineapple Nov 5, 2024
dace2fc
Merge branch 'Sect-of-the-Hunt' of https://github.com/MissClassyPinea…
MissClassyPineapple Nov 5, 2024
ba862ec
Sanity improvements
MissClassyPineapple Nov 5, 2024
c9da0e5
Merge branch 'Monkestation:master' into Sect-of-the-Hunt
MissClassyPineapple Nov 6, 2024
c6d7a9e
Merge branch 'Monkestation:master' into Sect-of-the-Hunt
MissClassyPineapple Nov 9, 2024
ce0e43f
Merge branch 'Monkestation:master' into Sect-of-the-Hunt
MissClassyPineapple Nov 10, 2024
d6f564e
Thrown spears can now only be stored in the quiver as intended
MissClassyPineapple Nov 10, 2024
27c7502
Merge branch 'Sect-of-the-Hunt' of https://github.com/MissClassyPinea…
MissClassyPineapple Nov 10, 2024
4a8f7ba
Fixes for testmerge compatibility
MissClassyPineapple Nov 12, 2024
4381bf5
Hopefully reset the changes to belt dmis now
MissClassyPineapple Nov 12, 2024
f6a0a87
Merge branch 'Monkestation:master' into Sect-of-the-Hunt
MissClassyPineapple Nov 12, 2024
bc6e68e
Casually 600 commits behind locally. End my pain
MissClassyPineapple Nov 12, 2024
8851aaf
Merge branch 'Sect-of-the-Hunt' of https://github.com/MissClassyPinea…
MissClassyPineapple Nov 12, 2024
8308b98
Merge branch 'Monkestation:master' into Sect-of-the-Hunt
MissClassyPineapple Nov 13, 2024
2d85c29
Merge branch 'Monkestation:master' into Sect-of-the-Hunt
MissClassyPineapple Nov 15, 2024
18475c2
Merge branch 'Monkestation:master' into Sect-of-the-Hunt
MissClassyPineapple Nov 22, 2024
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
Prev Previous commit
Next Next commit
Casually 600 commits behind locally. End my pain
  • Loading branch information
MissClassyPineapple committed Nov 12, 2024
commit bc6e68ea6655994c1d2e1250eb5280c82ec0f90f
Binary file modified icons/mob/clothing/belt.dmi
Binary file not shown.