LetterJay 06b7cdf27a Merge branch 'master' into upstream-merge-37529

2018-05-22 08:02:46 -05:00

..

area

Adds (fake) ambient occlusion as a client preference

2018-05-07 22:08:08 -05:00

gamemodes

Merge branch 'master' into upstream-merge-37486

2018-05-21 11:59:57 -05:00

machinery

Merge pull request #6829 from Citadel-Station-13/upstream-merge-37955

2018-05-22 02:28:21 +00:00

mecha

Merge branch 'master' into upstream-merge-37529

2018-05-22 08:02:46 -05:00

objects

Merge branch 'master' into upstream-merge-37529

2018-05-22 08:02:46 -05:00

turfs

Merge branch 'master' into upstream-merge-37529

2018-05-22 08:02:46 -05:00

alternate_appearance.dm

…

atoms_movable.dm

…

atoms.dm

…

communications.dm

…

data_huds.dm

…

say.dm

…

shuttle_engines.dm

…

sound.dm

…

world.dm

Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox

2018-05-17 21:38:41 -05:00