LetterJay ac5503d338 Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -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-33055

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

machinery

Merge branch 'master' into upstream-merge-33055

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

mecha

Merge pull request #33706 from AnturK/dumbmechacode

2017-12-21 01:37:53 -06:00

objects

Merge branch 'master' into upstream-merge-33055

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

turfs

Fix pulling things across space transitions (#33689)

2017-12-21 00:33:52 -06:00

alternate_appearance.dm

Fixed empty HUD_List breaking alternate_appearances (#33742)

2017-12-23 01:46:50 -06:00

atoms_movable.dm

Merge pull request #33306 from coiax/replace-clean-flag-with-component

2017-12-23 08:36:37 -06:00

atoms.dm

[READY]Refactors reagent container types

2017-12-18 22:54:51 -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

Add a single whitespace (#33746)

2017-12-23 01:43:37 -06:00