Neerti 462eaa834b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync ...

Conflicts:
	.travis.yml
	code/modules/clothing/spacesuits/rig/modules/combat.dm
	code/modules/clothing/spacesuits/rig/modules/utility.dm
	code/modules/mob/living/silicon/ai/ai.dm
	icons/mob/rig_back.dmi
	polaris.dme

2015-06-25 18:50:18 -04:00

..

drilling

Refactored random map generator system and added several terrain generators.

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

abandonedcrates.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

alloys.dm

Major sheet and material refactor.

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

coins.dm

Adds SLOT_EARS to various items

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

machine_input_output_plates.dm

…

machine_processing.dm

qdel

2015-05-12 13:12:58 +09:30

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 branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge

2015-06-05 22:11:15 -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

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

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