Neerti 6906acf193 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two ...

Conflicts:
	code/game/turfs/simulated/floor.dm
	icons/mob/back.dmi
	maps/exodus-3.dmm
	polaris.dme

2015-05-10 04:21:37 -04:00

..

drilling

Updates drill and scanner

2015-03-24 18:34:26 +03:00

abandonedcrates.dm

Crayons are now children of pens.

2015-05-05 08:41:24 +02:00

alloys.dm

First pass on ore distribution map and stationary drilling rig.

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

coins.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

machine_input_output_plates.dm

…

machine_processing.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

machine_stacking.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

machine_unloading.dm

…

mine_items.dm

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

2015-04-08 10:55:26 +02:00

mine_turfs.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 4/27/2015_bay_sync_2

2015-04-27 05:30:36 -04:00

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

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

money_bag.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

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

Updates storage costs

2015-03-05 10:40:25 -05:00

satchel_ore_boxdm.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00