Mloc-Argent dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm

2014-06-20 22:02:40 +01:00

..

drilling

Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.

2014-06-08 00:52:20 +09:30

abandonedcrates.dm

Removal of Telescience.

2014-04-16 20:23:56 -07:00

alloys.dm

First pass on ore distribution map and stationary drilling rig.

2014-06-07 23:07:49 +09:30

coins.dm

More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.

2014-06-08 01:39:49 +09:30

machine_input_output_plates.dm

…

machine_processing.dm

Ironed out some bugs. Everything should be working for testing purposes.

2014-06-08 00:04:58 +09:30

machine_stacking.dm

First pass on ore distribution map and stationary drilling rig.

2014-06-07 23:07:49 +09:30

machine_unloading.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

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

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

mine_turfs.dm

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

2014-06-20 22:02:40 +01:00

minerals.dm

Refactored material definitions a little bit, removed all bananium from the codebase.

2014-06-08 00:40:34 +09:30

mint.dm

Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.

2014-06-08 00:52:20 +09:30

money_bag.dm

Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.

2014-06-08 00:52:20 +09:30

ore_datum.dm

Refactored material definitions a little bit, removed all bananium from the codebase.

2014-06-08 00:40:34 +09:30

ore.dm

First pass on ore distribution map and stationary drilling rig.

2014-06-07 23:07:49 +09:30

satchel_ore_boxdm.dm

Refactored material definitions a little bit, removed all bananium from the codebase.

2014-06-08 00:40:34 +09:30