kevinz000 3c4c397c46 Merge remote-tracking branch 'citadel/master' into combat_rework

2020-04-08 04:04:45 -07:00

..

_martial.dm

save memory..

2020-03-26 14:13:18 -07:00

boxing.dm

BOXERS CAN ONLY KNOCK OUT OTHER BOXERS

2020-03-25 09:08:15 +11:00

cqc.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605

2020-03-06 04:00:36 +01:00

krav_maga.dm

compile

2020-01-11 11:28:03 -08:00

mushpunch.dm

([\W\.])Knockdown\(

2020-01-06 03:39:20 -08:00

plasma_fist.dm

Massively refactors martial arts, ports New Sleeping Carp

2020-03-10 20:09:31 +11:00

psychotic_brawl.dm

Massively refactors martial arts, ports New Sleeping Carp

2020-03-10 20:09:31 +11:00

rising_bass.dm

some adjustments for now

2020-03-11 15:26:21 +11:00

sleeping_carp.dm

Merge pull request #11476 from kevinz000/shield_refactor

2020-04-07 20:47:15 +00:00

wrestling.dm

refactors the code to be less awful

2020-03-31 00:20:44 +01:00