Erthilo b409a84f2d Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2012-05-29 15:00:11 +01:00

..

machine_input_output_plates.dm

…

machine_processing.dm

TG: - commented out the old adamantine recipe.

2012-04-23 22:10:26 +01:00

machine_stacking.dm

TG: - commented out the old adamantine recipe.

2012-04-23 22:10:26 +01:00

machine_unloading.dm

TG: - commented out the old adamantine recipe.

2012-04-23 22:10:26 +01:00

mine_areas.dm

…

mine_items.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

mine_turfs.dm

Actually fixes digging sand messages

2012-05-29 13:56:36 +10:00

mint.dm

TG: - commented out the old adamantine recipe.

2012-04-23 22:10:26 +01:00

money_bag.dm

…

ores_materials_coins.dm

TG: - commented out the old adamantine recipe.

2012-04-23 22:10:26 +01:00

satchel_ore_box.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00