Skip to content

Navigation Menu

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Sign up

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

Simple-Station / Einstein-Engines Public

Notifications You must be signed in to change notification settings
Fork 252
Star 77

Code
Issues 104
Pull requests 54
Discussions
Actions
Projects 1
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Security
Insights

Martial Artist Rework + Fix MeleeWeapon Wizmerge Bugs#1560

Merged

VMSolidus merged 13 commits intoSimple-Station:masterSimple-Station/Einstein-Engines:masterfrom

angelofallars:martial-artist-power-attackangelofallars/Einstein-Engines:martial-artist-power-attackCopy head branch name to clipboard

Jan 17, 2025

Conversation Commits13 (13)Checks Files changed

Commits

Commits on Jan 16, 2025

add power attack Martial Artist
angelofallars
committed
fix other melee traits not working with martial artist
angelofallars
committed
nerf martial artist extra range
angelofallars
committed
fix detection of light attack miss to be same as in SharedMeleeWeaponSystem
angelofallars
committed
buff bonus range slightly from 6.66% to 10%
angelofallars
committed
Redistribute melee weapon dmg to attack rate & give boxer/gladiator/martial artist the trait
angelofallars
committed
revert melee weapon wizmerge messery
angelofallars
committed
Merge branch 'master' into martial-artist-power-attack
angelofallars
authored
Make martial artist/gladiator able to take Striking Calluses
angelofallars
committed
make Martial Artist affect Lamia unarmed
angelofallars
committed
reduce Striking Calluses cost from 4 to 3
angelofallars
committed
Merge branch 'master' into martial-artist-power-attack
angelofallars
authored
prevent all pure-Blunt melee species from getting Natural Weapon Removal
angelofallars
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.