PsiOmega 3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm

2015-08-15 10:52:17 +02:00

..

antagonist

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

2015-08-14 08:34:42 +02:00

area

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

2015-08-11 08:34:46 +02:00

dna

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

2015-07-26 10:21:36 +02:00

gamemodes

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

2015-08-15 10:52:17 +02:00

jobs

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

2015-07-27 10:20:20 +02:00

machinery

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

2015-08-13 09:01:10 +02:00

magic

…

mecha

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

2015-07-26 10:21:36 +02:00

objects

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

2015-08-15 10:52:17 +02:00

turfs

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

2015-08-08 15:34:51 +02:00

vehicles

…

verbs

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

2015-07-14 08:21:12 +02:00

asteroid.dm

…

atoms_movable.dm

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

2015-08-14 08:34:42 +02:00

atoms.dm

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

2015-07-26 10:21:36 +02:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

fix #10617

2015-08-13 21:01:46 +01:00