PsiOmega fe09ed1a22 Merge remote-tracking branch 'upstream/dev' into BorgModules ...

Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/mob/living/silicon/ai/subsystems.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_upgrades.dm

2015-04-26 15:52:18 +02:00

..

drilling

Updates drill and scanner

2015-03-24 18:34:26 +03:00

abandonedcrates.dm

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

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

alloys.dm

…

coins.dm

…

machine_input_output_plates.dm

…

machine_processing.dm

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

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

machine_stacking.dm

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

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

machine_unloading.dm

…

mine_items.dm

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

2015-04-08 10:55:26 +02:00

mine_turfs.dm

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

2015-04-26 15:52:18 +02:00

minerals.dm

…

mint.dm

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

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

money_bag.dm

…

ore_datum.dm

…

ore.dm

…

satchel_ore_boxdm.dm

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

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