PsiOmegaDelta f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm

2015-09-11 08:38:28 +02: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/master' into dev-freeze

2015-09-11 08:38:28 +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

Fixes #10314

2015-08-02 00:01:10 -04:00

machine_stacking.dm

Major sheet and material refactor.

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

machine_unloading.dm

…

mine_items.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

mine_turfs.dm

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

2015-07-11 10:58:49 +02:00

mineral_effect.dm

…

mint.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

money_bag.dm

…

ore_datum.dm

…

ore.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

satchel_ore_boxdm.dm

…