PsiOmegaDelta 8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-07-14 08:11:11 +02:00

..

drilling

Changed steel material name to a define.

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

abandonedcrates.dm

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

2015-07-14 08:11:11 +02:00

alloys.dm

Major sheet and material refactor.

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

coins.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

machine_input_output_plates.dm

…

machine_processing.dm

qdel

2015-05-12 13:12:58 +09:30

machine_stacking.dm

Major sheet and material refactor.

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

machine_unloading.dm

…

mine_items.dm

Changed steel material name to a define.

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

mine_turfs.dm

Compilation fix.

2015-07-11 10:51:03 +02:00

mineral_effect.dm

Finalized wall refactor.

2015-04-26 12:58:57 +09:30

mint.dm

Major sheet and material refactor.

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

money_bag.dm

…

ore_datum.dm

Finalized wall refactor.

2015-04-26 12:58:57 +09:30

ore.dm

Finalized wall refactor.

2015-04-26 12:58:57 +09:30

satchel_ore_boxdm.dm

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

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