Jordan Brown e582e7019e Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay ...

Fix various bugs with telekinesis

2018-05-25 10:49:21 -05:00

..

area

…

gamemodes

Merge branch 'master' into upstream-merge-37582

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

machinery

Merge pull request #6865 from Citadel-Station-13/upstream-merge-38000

2018-05-25 02:37: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 #38023 from AutomaticFrenzy/patch/toh-kay

2018-05-25 10:49:21 -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

makes small tweaks to the hub entry (#6782)

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