PsiOmega 659b07415d Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm

2015-07-26 10:00:12 +02:00

..

combat

Merge resolution with master.

2015-06-28 06:02:52 +09:30

equipment

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

2015-07-26 10:00:12 +02:00

medical

Fixes #7627

2015-01-02 19:19:01 +10:30

working

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

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

mech_bay.dm

mood lighting for computers

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

mech_fabricator.dm

Major sheet and material refactor.

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

mech_sensor.dm

…

mecha_construction_paths.dm

Major sheet and material refactor.

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

mecha_control_console.dm

Changed steel material name to a define.

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

mecha_parts.dm

Changed steel material name to a define.

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

mecha_wreckage.dm

Major sheet and material refactor.

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

mecha.dm

Merge resolution with master.

2015-06-28 06:02:52 +09:30