Jordie0608 6140a61de7 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew() ...

Conflicts:
	code/modules/food&drinks/food/snacks_pastry.dm

2015-01-21 20:25:45 +11:00

..

area

Resolves #6971 - non-lighting_subarea areas are now stored in list/sortedAreas. This list is sorted by area name using timSort only when areas are added to it. Currently the only other thing that adds to this list is the station-blueprints object.

2015-01-18 20:46:30 +00:00

gamemodes

Merge pull request #7131 from Iamgoofball/goonchem_shoehorn_backup

2015-01-19 03:32:57 -03:00

jobs

Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2

2015-01-14 11:25:07 +08:00

machinery

Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()

2015-01-21 20:25:45 +11:00

mecha

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

objects

Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()

2015-01-21 20:25:45 +11:00

pooling

…

turfs

adjusts prob for dirt var increment

2015-01-14 21:36:04 -08:00

verbs

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

asteroid.dm

Removes Star Trek chemistry and transfers us to Goon Chemistry.

2015-01-16 17:21:36 -08:00

atoms_movable.dm

…

atoms.dm

* Fixed the onCentcomm check

2015-01-14 19:10:03 +01:00

communications.dm

…

data_huds.dm

…

dna.dm

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

…