LetterJay 761035b391 Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960 ...

[MIRROR] Fix some inconsistencies relating to resting

2018-05-27 14:39:18 -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-37582

2018-05-22 07:22:42 -05:00

machinery

Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960

2018-05-27 14:39:18 -05:00

mecha

Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582

2018-05-23 07:46:26 -05:00

objects

Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960

2018-05-27 14:39:18 -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

Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631

2018-05-27 01:32:02 -05:00

communications.dm

…

data_huds.dm

…

say.dm

…

shuttle_engines.dm

…

sound.dm

…

world.dm

makes small tweaks to the hub entry (#6782)

2018-05-23 12:12:57 -07:00