LetterJayandGitHub 408182758f Merge branch 'master' into upstream-merge-33498

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

..

alien

Merge branch 'master' into upstream-merge-33498

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

human

Merge branch 'master' into upstream-merge-33498

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

monkey

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

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

carbon_defense.dm

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

2017-12-16 13:08:50 -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

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

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

damage_procs.dm

Defines math, take 2

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

death.dm

…

emote.dm

…

examine.dm

Brain Traumas

2017-12-06 12:05:20 -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

Defines math, take 2

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

update_icons.dm

fixes icon_override only applying to uniforms

2017-12-10 16:37:28 -05:00