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

..

overmap

Bugfixes, removing the remnants of table_parts, changelog.

2015-05-13 20:40:00 +01:00

RandomZLevels

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

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

exodus-1.dmm

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

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

exodus-2.dmm

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

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

exodus-3.dmm

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

2015-07-31 10:00:16 +02:00

exodus-4.dmm

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

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

exodus-5.dmm

Map conflict and issue fixes.

2015-09-16 08:17:11 +02:00

exodus-6.dmm

Renamed shards, katanas, claymores.

2015-05-16 20:36:33 +09:30

PowerTesting.dmm

Cleans up access handling.

2015-03-02 18:55:03 +01:00