PsiOmegaDelta 06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm

2015-06-16 10:52:33 +02:00

..

antagonist

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

area

Merge pull request #9490 from Zuhayr/xenoruins

2015-06-02 20:59:52 +01:00

dna

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

gamemodes

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

jobs

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-05 00:49:13 +01:00

machinery

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

2015-06-16 10:52:33 +02:00

magic

…

mecha

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

objects

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

2015-06-16 10:52:33 +02:00

turfs

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

vehicles

…

verbs

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

asteroid.dm

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

atoms_movable.dm

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

2015-06-05 10:39:41 +02:00

atoms.dm

Merge pull request #9694 from PsiOmegaDelta/150605-Meteors

2015-06-08 14:17:57 +03:00

base_turf.dm

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

json.dm

…

periodic_news.dm

…

response_team.dm

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Supply shuttle and crate fixes

2015-05-23 16:15:04 +01:00