CleverRaven/Cataclysm-DDA — pull request #6291 by OvenBaker (2014-02-24 17:24:22+00:00)
Title: Melee-oriented martial arts

This extends the martial arts framework with more options for supporting weapons in martial arts techniques. Weapons can now specify martial arts they are compatible with (instead of it the blanket melee_allowed flag), and individual techniques can require specific flags on weapons (such as CHOP). It even allows specifying minimum bash / cut / stab values, so you can specifically target cutting weapons with weighted bases if you so desire (see puno strikes in Eskrima).

Since this wouldn't be complete without some examples, Eskrima and Fencing are provided, with appropriate weapon sets associated with them. If I get around to it I'll look at adding Systema, Silat and Kendo to round things out.

There are some sundry improvements whilst I was working with the martial arts frameworks. The quick tag is now a configurable speed multiplier, allowing more ranges than just normal speed or 2x speed. Techniques can be weighted so they are selected more often. A bug preventing bash / cut / stab multipliers on technique doing anything has been fixed, etc etc.

Finally: ain't *nobody* got time for feature freeze (or rather I expect this to wait till post 0.A).