deathride58 6a07a66cb3 Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

..

boxing.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

cqc.dm

fixes cqc working outside chef assigned areas (#37375)

2018-04-24 10:23:34 -05:00

krav_maga.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

mushpunch.dm

Merge pull request #37501 from ShizCalev/icon-fixes

2018-04-28 14:54:45 -05:00

plasma_fist.dm

Refactors Spell and Martial Art Books to use Action Granters!

2018-03-28 12:18:06 -05:00

psychotic_brawl.dm

[MIRROR] Replaced body zone magic strings with defines (#6004)

2018-03-19 21:18:57 -05:00

sleeping_carp.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

wrestling.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00