Ccomp5950 976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05:00

..

area

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00

dna

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

gamemodes

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00

jobs

Disabling of Genetics

2014-04-09 01:28:38 -07:00

machinery

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00

magic

…

mecha

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00

objects

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00

turfs

Revert "Merge pull request #4478 from Aryn/master"

2014-03-24 13:55:41 +00:00

vehicles

…

verbs

Fix for mods counting.

2014-02-02 02:33:53 +03:00

asteroid.dm

…

atoms_movable.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

atoms.dm

atmos: remove a few force-deletes in merge code

2014-04-07 17:28:09 +01:00

communications.dm

…

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

supplyshuttle.dm

Revert "Merge pull request #4513 from Aryn/master"

2014-03-24 13:55:23 +00:00