paprka 30348d8cdd Merge branch 'master' of https://github.com/tgstation/-tg-station into holster ...

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm

2015-01-23 16:48:30 -08: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 #7006 from Incoming5643/hot_wiz_on_wiz

2015-01-21 15:34:25 -03:00

jobs

SecSprites2015

2015-01-21 23:07:15 +08:00

machinery

resolve conflicts

2015-01-23 01:36:58 -05: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 holster

2015-01-23 16:48:30 -08:00

pooling

…

turfs

Merge pull request #7177 from Menshin/disposals_cleaning_part2

2015-01-23 02:26:30 -03: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

Made onCentcomm() check for the atom turf instead of the atom itself

2015-01-20 00:04:57 +01:00

communications.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

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

…