Kelenius 317abc6b79 Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm

2015-04-28 10:49:26 +03:00

..

crates_lockers

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

stool_bed_chair_nest

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

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

barsign.dm

Adds 9 new bar signs.

2015-04-24 17:35:07 +03:00

bedsheet_bin.dm

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

coathanger.dm

Fixes #8696

2015-03-31 20:30:06 -04:00

curtains.dm

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

2015-04-24 17:13:37 +02:00

displaycase.dm

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

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

door_assembly.dm

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

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

electricchair.dm

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

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

extinguisher.dm

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

2015-03-31 02:13:22 -04:00

false_walls.dm

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

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

flora.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

girders.dm

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

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

grille.dm

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

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

inflatable.dm

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

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

janicart.dm

Chemistry commit

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

kitchen_spike.dm

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

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

ladders.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

lamarr_cage.dm

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

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

lattice.dm

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

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

mineral_doors.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

mirror.dm

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

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

mop_bucket.dm

Chemistry commit

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

morgue.dm

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

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

musician.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

noticeboard.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

safe.dm

Accessories update.

2015-02-08 12:35:50 +03:00

signs.dm

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

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

tables_racks.dm

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

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

tank_dispenser.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

target_stake.dm

Removes unnecessary and cruft procs from mob/inventory.dm

2015-03-30 05:28:09 -04:00

transit_tubes.dm

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

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

under_wardrobe.dm

Attempts to fix persistent station alarms. Makes wardrobes solid.

2015-03-09 20:55:05 +01:00

watercloset.dm

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

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

windoor_assembly.dm

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

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

window.dm

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

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