Lin ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry ...

Ok ok hear me out: Implements unarmed parry.

2020-07-18 17:02:02 -05:00

..

alien

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

human

Merge pull request #12679 from silicons/unarmed_parry

2020-07-18 17:02:02 -05:00

monkey

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

2020-07-08 22:02:03 -07:00

carbon_active_parry.dm

fix

2020-07-17 12:46:32 -07:00

carbon_defense.dm

whew

2020-07-07 20:48:54 -07:00

carbon_defines.dm

Merge conflict fix

2020-05-13 12:37:18 +03:00

carbon_movement.dm

fixes dreamchecker errors

2020-05-27 18:17:00 -07:00

carbon_sprint.dm

…

carbon.dm

Merge pull request #12630 from Ghommie/Ghommie-cit822

2020-07-02 01:44:59 -07:00

damage_procs.dm

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

2020-06-23 03:12:49 +02:00

death.dm

Combat mode component. (#12338)

2020-05-27 18:00:32 -07:00

emote.dm

…

examine.dm

part 2

2020-06-10 23:14:25 +01:00

inventory.dm

You can't (un)equip garments on/from obscured inventory slots anymore.

2020-06-28 01:10:22 +02:00

life.dm

Update life.dm

2020-07-14 04:30:38 -07:00

say.dm

…

status_procs.dm

…

update_icons.dm

some fixes

2020-06-26 22:49:43 +01:00