skull132 8b5c7bc2c5 Conflict resolution ...

Merge remote-tracking branch 'Aurorastation/development'

# Conflicts:
#	config/example/config.txt

2016-03-25 22:25:41 +02:00

..

xenoarchaeology

JMP logs for days

2016-03-25 18:27:37 +02:00

circuitprinter.dm

Fixes #10637

2015-08-14 23:34:24 -04:00

designs.dm

Merge remote-tracking branch 'Lady_of_ravens/gloves'

2016-01-28 01:44:28 +02:00

destructive_analyzer.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

message_server.dm

Generalizing establish_db_connection() and setup_database_connection()

2016-03-04 00:53:37 +02:00

protolathe.dm

Fixes not being able to insert a complete stack into the protolathe

2015-08-02 00:26:30 -04:00

rd-readme.dm

…

rdconsole.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

rdmachines.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

research.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

server.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00