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

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

..

arrivals.dm

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

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

assault_pod.dm

…

computer.dm

…

elevator.dm

…

emergency.dm

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

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

ferry.dm

…

manipulator.dm

…

navigation_computer.dm

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

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

on_move.dm

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

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

ripple.dm

…

shuttle_rotate.dm

…

shuttle.dm

Defines math, take 2

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

special.dm

…

supply.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

syndicate.dm

…

white_ship.dm

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

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