Zuhayr 0c83a95b90 Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

..

drilling

Fixed the overlay issue for now. This will need replacing.

2014-08-13 12:04:51 +09:30

abandonedcrates.dm

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

alloys.dm

First pass on ore distribution map and stationary drilling rig.

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

coins.dm

Stack update

2014-09-02 09:59:32 +04:00

machine_input_output_plates.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

machine_processing.dm

Fixes 5866#

2014-09-01 23:20:46 +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

Moved ambiance sounds out of horrendous ifchain to area definitions.

2014-08-16 04:40:46 +04:00

mine_items.dm

Added flags for Mining and Xenoarch.

2014-08-01 22:40:48 +09:30

mine_turfs.dm

Trying to add to previous.

2014-09-10 21:16:06 +09:30

minerals.dm

Resprited the majority of mining ores and turfs, added coal and plat to surface mining, add falloff for edges of asteroid.

2014-07-20 16:29:18 +09:30

mint.dm

Stack update

2014-09-02 09:59:32 +04:00

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

Resprited the majority of mining ores and turfs, added coal and plat to surface mining, add falloff for edges of asteroid.

2014-07-20 16:29:18 +09:30

ore.dm

Resprited the majority of mining ores and turfs, added coal and plat to surface mining, add falloff for edges of asteroid.

2014-07-20 16:29:18 +09:30

satchel_ore_boxdm.dm

Fixes #6436

2014-09-18 13:12:36 +09:30