Kelenius 10915eae24 Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm

2015-05-15 11:28:05 +03:00

..

combat

Added exosuit customisation kits to cargo.

2015-05-13 11:20:54 +09:30

equipment

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

medical

Fixes #7627

2015-01-02 19:19:01 +10:30

working

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

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

mech_bay.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

mech_fabricator.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

mech_sensor.dm

Now mecha area denial feedback is closer to 5 seconds apart then ever.

2014-08-24 23:41:15 +02:00

mecha_construction_paths.dm

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

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

mecha_control_console.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

mecha_parts.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

mecha_wreckage.dm

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

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

mecha.dm

Merge pull request #9202 from Zuhayr/customitems

2015-05-14 21:47:04 +03:00