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

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

..

area

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

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

gamemodes

Merge branch 'master' into upstream-merge-33498

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

machinery

Merge branch 'master' into upstream-merge-33498

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

mecha

Merge branch 'master' into upstream-merge-33498

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

objects

Merge branch 'master' into upstream-merge-33498

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

turfs

Merge branch 'master' into upstream-merge-33498

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

alternate_appearance.dm

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

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

atoms_movable.dm

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

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

atoms.dm

Removes bad comment. Makes check saner (#33270)

2017-12-05 15:50:08 -06:00

communications.dm

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

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

data_huds.dm

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

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

say.dm

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

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

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

Gun sounds (#33615)

2017-12-18 15:15:25 -06:00

world.dm

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

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