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

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution

2014-12-16 02:52:08 +03:00

..

area

* limit atmos/fire alerts to the current z_level

2014-11-14 10:10:45 +01:00

gamemodes

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

2014-12-16 02:52:08 +03:00

jobs

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

2014-12-16 02:52:08 +03:00

machinery

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

2014-12-16 02:52:08 +03:00

mecha

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

2014-12-14 03:07:13 +03:00

objects

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

2014-12-16 02:52:08 +03:00

pooling

…

turfs

Monkifying change and some mutations fixes

2014-12-14 03:04:23 +03:00

verbs

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

2014-12-03 18:59:32 +01:00

asteroid.dm

Conflicts:

2014-11-13 17:33:32 +01: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 GenShit

2014-12-14 03:07:13 +03:00

communications.dm

* limit atmos/fire alerts to the current z_level

2014-11-14 10:10:45 +01:00

data_huds.dm

Fixes implants not updating the implant secHUD

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

dna.dm

Monkifying change and some mutations fixes

2014-12-14 03:04:23 +03:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Sounds in space/places with low pressure are quieter. You cannot hear people in low pressure environments unless you are next to them (or are them)

2014-11-19 17:03:12 +00:00