Majkl-J b6b8306fda Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-02a

2025-02-20 00:00:19 -08:00

..

_martial.dm

…

boxing.dm

Hunter Boxing maintenance; direct heals rather than reagents, no speed up combos throwing you off your game, rounding issues (#89378)

2025-02-08 00:06:47 +01:00

cqc.dm

…

krav_maga.dm

…

mushpunch.dm

…

plasma_fist.dm

…

psychotic_brawl.dm

…

sleeping_carp.dm

Space Carps & Dragons now speak Carptongue instead of Common. Space Dragons also speak Draconic. (#89034)

2025-01-16 11:56:43 +11:00

wrestling.dm

…