GinjaNinja32 63ea8338fb Merge remote-tracking branch 'upstream/dev' into span_class=notice ...

Conflicts:
	code/ZAS/Diagnostic.dm
	code/game/machinery/computer3/laptop.dm
	code/game/machinery/requests_console.dm
	code/game/objects/items/stacks/tiles/plasteel.dm

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

..

overmap

Bugfixes, removing the remnants of table_parts, changelog.

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

RandomZLevels

Non-code .dm files with escapes

2015-05-30 14:12:26 +01:00

exodus-1.dmm

Request Console cleanup.

2015-06-03 22:38:04 -04:00

exodus-2.dmm

Fixes #9544

2015-05-31 03:56:06 +09:30

exodus-3.dmm

Telecommunications Solar Arrays

2015-05-25 06:18:10 +02:00

exodus-4.dmm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

exodus-5.dmm

Refactored random map generator system and added several terrain generators.

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

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