silicons 0331f0cdc3 Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum ...

Revert "[TESTMERGE ONLY] FUCK"

2020-08-18 18:52:52 -07:00

..

alien

Merge pull request #12834 from silicons/clickcd_experimental

2020-07-28 21:51:10 -05:00

human

Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum

2020-08-18 18:52:52 -07:00

monkey

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

2020-07-23 10:26:03 -07:00

carbon_active_parry.dm

fix

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

carbon_defense.dm

Merge pull request #12894 from timothyteakettle/wounds-part-2

2020-08-03 14:43:07 -07:00

carbon_defines.dm

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

2020-07-23 16:23:34 -07:00

carbon_movement.dm

…

carbon_sprint.dm

…

carbon.dm

Merge branch 'master' into wounds-part-2

2020-07-29 15:47:44 +01:00

damage_procs.dm

section one

2020-07-24 22:34:22 +01:00

death.dm

…

emote.dm

…

examine.dm

section one

2020-07-24 22:34:22 +01:00

inventory.dm

yee

2020-08-15 21:29:39 -05:00

life.dm

Makes it actually work

2020-07-29 01:50:40 +03:00

say.dm

…

status_procs.dm

…

update_icons.dm

some fixes

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