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

..

Cleanable

new object-based lighting system

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

posters

Adds 7 new posters.

2015-03-06 21:14:32 -06:00

cleanable.dm

Updates bots to be mobs. Several changes.

2015-04-26 15:30:11 +03:00

contraband.dm

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

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

crayon.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

misc.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

remains.dm

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

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

warning_stripes.dm

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

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