Ccomp5950 98fba3b6b0 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev ...

Conflicts:
	code/modules/mining/machine_processing.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/virus2/helpers.dm

2014-03-18 19:44:19 -05:00

..

abandonedcrates.dm

Fix for unlocking exploit.

2014-02-09 13:34:40 +03:00

machine_input_output_plates.dm

…

machine_processing.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev

2014-03-18 19:44:19 -05:00

machine_stacking.dm

Code effeciency project: Ore processing.

2014-03-15 04:05:56 -05:00

machine_unloading.dm

…

mine_areas.dm

added dwarf fortress music for the title screen and mining asteroid

2013-01-07 22:13:24 +10:00

mine_items.dm

Mining drill text

2014-02-28 12:15:41 +13:00

mine_turfs.dm

Fix for mining.

2014-01-09 17:26:13 -07:00

minerals.dm

Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.

2014-01-08 21:33:17 -07:00

mint.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

money_bag.dm

…

ores_coins.dm

Small tweak to coin flipping.

2014-03-14 18:39:22 +02:00

satchel_ore_boxdm.dm

observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update

2013-01-21 18:47:03 +10:00