Neerti 95240c989b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync ...

Conflicts:
	polaris.dme

2015-08-03 22:13:18 -04:00

..

drilling

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

abandonedcrates.dm

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

2015-07-14 08:21:12 +02:00

alloys.dm

fixes #10141

2015-07-27 10:49:51 +01:00

coins.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

machine_input_output_plates.dm

…

machine_processing.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync

2015-08-03 22:13:18 -04:00

machine_stacking.dm

Removes machinedir on in machine_processing.dm and machine_stacking.dm

2015-07-07 18:43:59 -04:00

machine_unloading.dm

…

mine_items.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

mine_turfs.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2

2015-07-16 22:46:53 -04:00

mineral_effect.dm

Finalized wall refactor.

2015-04-26 12:58:57 +09:30

mint.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

money_bag.dm

…

ore_datum.dm

Finalized wall refactor.

2015-04-26 12:58:57 +09:30

ore.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03: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