Firecage ee3e8d2846 merge conflict fix

2017-10-05 11:22:57 +02:00

..

boxing.dm

Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524)

2017-06-18 23:03:51 -03:00

cqc.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

krav_maga.dm

Some names -> string

2017-09-26 15:59:57 -05:00

plasma_fist.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

sleeping_carp.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

wrestling.dm

Does some code standardization/consistency

2017-10-05 11:13:47 +02:00