Jack Edge 5da579b7c4 Merge branch 'master' into random-space ...

Conflicts:
	_maps/asteroidstation.dm

2016-06-20 13:06:08 +01:00

..

antimatter

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

singularity

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

supermatter

Cleaned maps, ruin verbs

2016-06-12 01:32:59 +01:00

tesla

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

apc.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

cable.dm

Fixes robotic chest and head augmentation being invisible for species without sexual dimorphism.

2016-06-14 21:12:23 +02:00

cell.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

engine.dm

…

generator.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

gravitygenerator.dm

Fixes #17701

2016-06-18 19:22:59 +02:00

lighting.dm

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

monitor.dm

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

port_gen.dm

Imprinter origin and req lvls

2016-05-22 23:46:05 +03:00

power.dm

…

powernet.dm

…

smes.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

solar.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

switch.dm

…

terminal.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

tracker.dm

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

turbine.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00