PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

2015-10-11 17:17:41 +02:00

..

antagonist

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-10-07 08:07:23 +02:00

area

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-27 08:53:22 +02:00

dna

…

gamemodes

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-10-07 08:07:23 +02:00

jobs

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

2015-08-26 03:09:11 +09:30

machinery

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-10-11 17:17:41 +02:00

magic

…

mecha

…

objects

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-10-11 17:17:41 +02:00

turfs

Corrects world-edge math.

2015-09-18 15:23:18 +02:00

vehicles

…

verbs

…

asteroid.dm

…

atoms_movable.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-26 08:43:06 +02:00

atoms.dm

Merge pull request #11134 from Baystation12/master

2015-09-18 08:50:11 +02:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-05 09:24:30 +02:00

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

…