Nerd Lord ab6cadec73 Merge branch 'master' of https://github.com/tgstation/tgstation into barriershimmer ...

Conflicts:
	icons/effects/effects.dmi

2016-06-04 00:19:18 -04:00

..

area

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

gamemodes

Merge branch 'master' of https://github.com/tgstation/tgstation into barriershimmer

2016-06-04 00:19:18 -04:00

machinery

Conflicts II

2016-06-03 15:42:19 -04:00

mecha

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

objects

Merge pull request #18085 from Xhuis/earsplitting_string

2016-06-03 19:55:04 -04:00

pooling

…

turfs

YOU CAN'T HIDE FROM ME

2016-06-03 15:53:54 -04:00

verbs

Conflicts II

2016-05-17 07:13:01 -04:00

alternate_appearance.dm

…

asteroid.dm

prevents capsules from breaching escape shuttle

2016-05-23 02:14:20 -04:00

atoms_movable.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

atoms.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

communications.dm

…

data_huds.dm

…

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

…