PsiOmega 8e3861141c Merge branch 'dev' into PowerTwo ...

Conflicts:
	code/modules/power/solar.dm

2014-10-24 13:32:36 +02:00

..

drilling

Fixes chem splicing, bioluminescence and seed packets for xenobotany.

2014-10-15 10:05:50 +10: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

Basically ripped over /tg/'s powernet and cable code into our own codebase.

2014-10-13 17:13:04 +02:00

machine_input_output_plates.dm

…

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