LetterJay 3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519 ...

[MIRROR] Finishes the forceMove port

2017-12-17 20:28:07 -06:00

..

alien

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

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

human

Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519

2017-12-17 20:28:07 -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

A few investigate_log and message_admin fixes

2017-11-24 22:42:01 -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

Brain Traumas

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

fixes brain_damage_lines.json compile errors

2017-12-15 16:35:07 -08:00

say.dm

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

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

status_procs.dm

Brain Traumas

2017-12-06 12:05:20 -06:00

update_icons.dm

fixes icon_override only applying to uniforms

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