zerothebigboy 7870d90de3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radiationsuitsareugly ...

# Conflicts:
#	icons/mob/clothing/hands.dmi
#	icons/mob/clothing/head.dmi
#	icons/obj/clothing/gloves.dmi
#	icons/obj/clothing/hats.dmi

2020-07-22 01:03:55 -04:00

..

_martial.dm

let's finish parrying

2020-05-28 04:55:43 -07:00

boxing.dm

Linter.

2020-07-03 19:57:38 +02:00

cqc.dm

This fixes everyone being a pugilist holy fuck

2020-04-21 00:36:54 +10:00

krav_maga.dm

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

2020-07-22 01:03:55 -04:00

mushpunch.dm

Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now

2020-04-07 17:51:25 +10:00

plasma_fist.dm

This fixes everyone being a pugilist holy fuck

2020-04-21 00:36:54 +10:00

psychotic_brawl.dm

Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now

2020-04-07 17:51:25 +10:00

rising_bass.dm

This fixes everyone being a pugilist holy fuck

2020-04-21 00:36:54 +10:00

sleeping_carp.dm

Porting the twohanded component.

2020-05-17 18:16:53 +02:00

wrestling.dm

optimisaiton

2020-07-14 18:51:46 +01:00