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

Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi

2015-02-05 17:44:22 -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 #7440 from AlexanderUlanH/bleb

2015-02-05 18:12:12 +01:00

jobs

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

2015-02-05 17:44:22 -08:00

machinery

Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo

2015-02-05 18:45:53 +01:00

mecha

Merge pull request #7330 from Menshin/variables_clusterbangs

2015-01-28 09:25:50 -06:00

objects

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

2015-02-05 17:44:22 -08:00

pooling

…

turfs

Fixes being unable to place cables on plating

2015-02-02 01:14:46 +01: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

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

atoms_movable.dm

Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)

2014-11-02 14:10:03 -03:00

atoms.dm

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

2015-01-25 21:56:39 -08:00

communications.dm

SubSystem rewrite

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

data_huds.dm

Fixes implants not updating the implant secHUD

2014-11-27 12:56:17 -03:00

dna.dm

Fixes some more dna issues

2015-01-27 07:22:37 +03:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Atoms don't have clients, Revert of previous commit

2014-12-27 01:04:32 +00:00