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

Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/door.dm
	code/game/objects/transfer_valve.dm
	code/game/turf.dm
	code/modules/clothing/gloves.dm
	maps/tgstation.2.0.8.dmm

2012-06-19 22:09:30 +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

NEW MINING STATION; OPINIONS AND BUGS GO HERE: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=5733

2011-08-16 04:14:44 +00:00

mine_items.dm

TG: Made you able to disassemble a few more computers. These are:

2012-06-01 23:18:12 +01:00

mine_turfs.dm

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

2012-06-19 22:09:30 +01: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: Sieve stuff, this is a stupidly big commit, I'm sorry, I really am.

2012-06-19 21:37:44 +01:00

satchel_ore_box.dm

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

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