paprka 21df99154d Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya ...

Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/obj/gun.dmi

2014-12-25 13:51:43 -08:00

..

area

…

gamemodes

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

2014-12-25 13:51:43 -08:00

jobs

fixed compile errors

2014-12-24 21:03:22 -08:00

machinery

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

2014-12-25 13:12:46 -08:00

mecha

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

objects

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

2014-12-25 13:51:43 -08:00

pooling

…

turfs

Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake

2014-12-24 19:48:24 -08:00

verbs

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

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

asteroid.dm

Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.

2014-12-09 19:38:49 -08:00

atoms_movable.dm

…

atoms.dm

refactors narsie to use the object oriented programming meme

2014-12-18 11:44:20 -08:00

communications.dm

…

data_huds.dm

Fixes implants not updating the implant secHUD

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

dna.dm

Merge pull request #5945 from JJRcop/get_ghost-fix

2014-12-03 17:45:07 +01: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