Kelenius a2cea5c49c Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm

2015-04-28 19:22:35 +03:00

..

admin

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

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

alarm

…

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

Cameras now have a small chance of being permanently destroyed.

2015-04-27 19:09:46 +02:00

examine

…

ext_scripts

…

flufftext

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

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

food

…

games

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

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

genetics

…

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 19:22:35 +03:00

icon generation

…

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 19:22:35 +03:00

nano

Fixes #8536

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

organs

Removes unused files added by accident, separates reagent files

2015-04-28 11:00:56 +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 19:22:35 +03:00

power

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

2015-04-28 08:43:31 +02: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 19:22:35 +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

…

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