LetterJay 290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916

2017-12-26 08:24:20 -06:00

..

alien

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

human

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

2017-12-26 08:24:20 -06:00

monkey

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

2017-12-26 08:24:20 -06:00

carbon_defense.dm

[Ready Again]Refactors disabilities into lists, allowing for independent disability sources

2017-12-18 15:19:53 -06:00

carbon_defines.dm

[Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209)

2017-12-18 20:29:37 -06:00

carbon_movement.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

carbon.dm

Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405

2017-12-21 03:42:38 +00:00

damage_procs.dm

Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405

2017-12-21 03:42:38 +00:00

death.dm

…

emote.dm

…

examine.dm

[Ready]Brain Trauma additions

2017-12-17 11:11:10 -06:00

give.dm

Update give.dm

2017-10-08 14:55:37 -05:00

inventory.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

life.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

say.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

status_procs.dm

Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00

update_icons.dm

[Ready Again]Refactors disabilities into lists, allowing for independent disability sources

2017-12-18 15:19:53 -06:00