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

Make reset var handle lists properly

2016-03-10 19:14:33 -08:00

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

Adds accreditation for myself because I forgot to and it's fine to credit yourself when it's like a mini-system thing instead of just like one line fixes gosh.

2016-04-06 21:28:01 +01:00

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

Removes a bunch of sleep(-1) and spawn(-1) from the code

2016-01-04 15:17:12 -08:00

data_huds.dm

Fixes a few simple animal huds

2016-05-04 18:40:58 -04:00

say.dm

Mecha Speech Bubbles

2015-10-31 14:42:12 +01:00

shuttle_engines.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

skincmd.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

sound.dm

initial commit

2016-05-07 14:39:17 -07:00