Razharas b4f011bacb Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable ...

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/power/cable.dm

Fixing conflicts

2014-01-31 05:20:59 +04:00

..

laborcamp

* Increased the amount of iron that spawns in the labor camp.

2013-12-23 22:26:36 +00:00

machine_input_output_plates.dm

Removed the need of the input and output object for the machinery of mining.

2013-11-26 09:12:21 -03:00

machine_processing.dm

changes strings to paths on the mining machinery code

2014-01-03 03:23:28 -03:00

machine_stacking.dm

Removed the need of the input and output object for the machinery of mining.

2013-11-26 09:12:21 -03:00

machine_unloading.dm

Removed the need of the input and output object for the machinery of mining.

2013-11-26 09:12:21 -03:00

mine_areas.dm

[MAP] Mining fixes and a remap

2013-11-06 23:26:46 -05:00

mine_items.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

mine_turfs.dm

Fixes a possible runtime with gibtonite deposits.

2014-01-29 18:10:21 -08:00

mint.dm

changes strings to paths on the mining machinery code

2014-01-03 03:23:28 -03:00

money_bag.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

ores_coins.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable

2014-01-31 05:20:59 +04:00

satchel_ore_boxdm.dm

Mineral boxes will now handle properly the movements of the mineral ores when a player click on them with one.

2014-01-15 20:08:35 -03:00