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

melee combat rework test #3951

Closed
wants to merge 119 commits into from
Closed

melee combat rework test #3951

wants to merge 119 commits into from

Conversation

FalloutFalcon
Copy link
Member

@FalloutFalcon FalloutFalcon commented Dec 31, 2024 •
edited
Loading

About The Pull Request

not really designed as a finished pr but something i want to test merge this wensday to see its affect on the combat!
alot of diffrenct changes to weapons
including but not limited

  • differing cool downs
  • parrying
  • better sounds
  • no more shield stacking
  • more levels to the force string as to better communicate damage (toolboxes are now medium force)

many behind the scenes refactors

  • energy weapons now are subtyped smart (halberds are like 8 lines isntead of like the 70 they used to be)
  • shields arent all relying on the riot subtype for logic
  • sledge now has its own type

I don't plan on merging this in this state, expect some amount of atomization after test merge

Why It's Good For The Game

melee more fun c:

@FalloutFalcon
orginize some weapon sprites
6083109
@FalloutFalcon
more orginzing
f81394f
@FalloutFalcon
new sprites mabye
ae8b538
@FalloutFalcon
fix energy weapon icon path
925010f
@FalloutFalcon
orginizes files
4adba95
@FalloutFalcon
cruft
4a76632
@FalloutFalcon
yea
b9c2bdf
@FalloutFalcon
orginizes primal and clothing cat (cherrypicked)
e03cb56
@FalloutFalcon
orginizes some more recipes
4f1bd7f
@FalloutFalcon
recipe cruft
57b39e9
@FalloutFalcon
yea
68903db
@FalloutFalcon
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
4053cc9 
…to improv
@FalloutFalcon
trailing whitespace
b6fab46
@FalloutFalcon
better sword parent
bacc3d4
@FalloutFalcon
renove null rod
4ff3443
@FalloutFalcon
yuh
11bfe91
@FalloutFalcon
bad type
ac1b4a2
@FalloutFalcon
remaps chappy armor
7f316d6
@FalloutFalcon
ytea
f3ded51
@FalloutFalcon
axe parent type, removes magic hammers
dc8d07f
@FalloutFalcon
stuff
e4d9d66
@FalloutFalcon
removing cult weapons
e4671a6
@FalloutFalcon
oops
3fb28b7
@FalloutFalcon
oops
e2fccf8
@FalloutFalcon
what if i just deleted the cult file haha so silly
d26bf9f
@FalloutFalcon
Revert "what if i just deleted the cult file haha so silly"
2171f22 
This reverts commit d26bf9f.
@FalloutFalcon
fixing sprites by removing stuff mostly c:
aa6115b
@FalloutFalcon
removes bostaff cruft item (tho i do want a cool matrial staff)
83a92e0
@FalloutFalcon
almost passing i think
d7a2276
@FalloutFalcon
damn bone spear was like better then a plasma spear what the hell
f8a9ff4
@FalloutFalcon FalloutFalcon added the Do Not Merge You probably made someone angry, or you're stopping people from getting angry. label Dec 31, 2024
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Sprites A bikeshed full of soulless bikes. Sound USSR Anthem 2.66 MB file. Ship Ship successfully tested. Code change Watch something violently break. Ruin Ruin successfully tested. labels Dec 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Code change Watch something violently break. DME Edit Do Not Merge You probably made someone angry, or you're stopping people from getting angry. Map Change Tile placing is hard. Thank you for your service. Ruin Ruin successfully tested. Ship Ship successfully tested. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@FalloutFalcon