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

..

admin

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

alarm

Fixes camera network changes not always being reflected in camera consoles.

2015-02-25 19:50:07 +01:00

assembly

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

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

awaymissions

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

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

client

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

2015-04-27 08:08:39 +02:00

clothing

Merge pull request #8960 from mwerezak/item-color

2015-04-28 06:25:35 +03:00

customitems

Merge branch 'dev' into ofChemistryAndStuff

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

detectivework

Merge branch 'dev' into ofChemistryAndStuff

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

economy

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

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

events

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

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

examine

Fixes #8439.

2015-03-13 23:27:35 +01:00

ext_scripts

…

flufftext

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

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

food

Removing unused and now uncompilable distillery code.

2015-02-21 22:37:53 +10:30

games

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

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

genetics

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

holodeck

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

hydroponics

Merge branch 'dev' into ofChemistryAndStuff

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

icon generation

Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation

2015-01-09 21:55:11 +06:00

library

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

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

liquid

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

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

maps

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

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

mining

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

2015-04-26 15:52:18 +02:00

mob

Merge branch 'dev' into ofChemistryAndStuff

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

nano

Fixes #8536

2015-04-27 01:11:40 -04:00

organs

Merge branch 'dev' into ofChemistryAndStuff

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

overmap

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

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

paperwork

Merge branch 'dev' into ofChemistryAndStuff

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

power

Merge pull request #9003 from mwerezak/dev-fixes

2015-04-28 06:26:22 +03:00

projectiles

Merge branch 'dev' into ofChemistryAndStuff

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

random_map

Clean server start.

2015-04-18 15:32:25 +02:00

reagents

Merge branch 'dev' into ofChemistryAndStuff

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

recycling

Adds Destroys.

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

research

Merge branch 'dev' into ofChemistryAndStuff

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

scripting

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

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

security levels

Allows admins to more easily set security levels.

2015-03-31 14:32:28 +02:00

shieldgen

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

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

shuttles

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

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

spells

Merge branch 'dev' into ofBotsAndMobs

2015-04-26 17:18:20 +03:00

supermatter

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

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

surgery

Merge branch 'dev' into ofChemistryAndStuff

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

vehicles

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

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

virus2

Merge branch 'dev' into ofChemistryAndStuff

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