PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm

2015-06-26 20:28:47 +02:00

..

antagonist

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

2015-06-22 16:59:19 +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

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

2015-06-26 20:28:47 +02:00

jobs

Fixes #9853.

2015-06-18 08:13:30 +02:00

machinery

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

2015-06-26 20:28:47 +02:00

magic

…

mecha

Merge with dev-freeze.

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

objects

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

2015-06-26 20:28:47 +02:00

turfs

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

2015-06-26 20:28:47 +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 with dev-freeze.

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

atoms.dm

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

2015-06-21 01:18:25 +09:30

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

Merge with dev-freeze.

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

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