LetterJay 5da8c5d520 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26952

2017-05-17 10:12:36 -05:00

..

area

Winter Wonderland holodeck no longer has freon, and it's no longer restricted

2017-04-30 15:12:51 -05:00

gamemodes

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26952

2017-05-17 10:12:36 -05:00

machinery

Merge pull request #989 from Citadel-Station-13/upstream-merge-27214

2017-05-17 10:50:20 -04:00

mecha

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

objects

Merge pull request #990 from Citadel-Station-13/upstream-merge-27271

2017-05-17 10:51:02 -04:00

turfs

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

alternate_appearance.dm

Fixes carelessness. (#577)

2017-04-26 10:37:57 -05:00

atoms_movable.dm

commit

2017-05-16 23:35:54 -05:00

atoms.dm

Merge branch 'master' into upstream-merge-26776

2017-05-17 05:14:18 -04:00

communications.dm

…

data_huds.dm

When jumpsuits take severe damage, their suit sensors break.

2017-04-27 02:32:35 -05:00

say.dm

Prepends object names with 'The' in speech

2017-05-17 05:13:47 -05:00

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

Refactors ears into organs (#513)

2017-04-26 09:52:35 -05:00