Kelenius 41ff9819bd Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm

2015-03-31 17:44:42 +03:00

..

__HELPERS

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

_defines

Chemistry commit

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

_onclick

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

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

ATMOSPHERICS

#define CONNECT_TYPE_HE 8

2015-03-26 16:31:13 +02:00

controllers

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

datums

Merge branch 'dev' into ofChemistryAndStuff

2015-03-31 17:44:42 +03:00

defines

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

2015-03-29 16:23:06 +02:00

FEA

…

game

Merge branch 'dev' into ofChemistryAndStuff

2015-03-31 17:44:42 +03:00

js

…

modules

Merge branch 'dev' into ofChemistryAndStuff

2015-03-31 17:44:42 +03:00

TriDimension

…

ZAS

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs

2015-03-26 17:01:33 +10:30

global.dm

finishes work on adapting the goon process scheduler for BS12.

2015-03-04 05:14:36 -05:00

hub.dm

…

names.dm

…

setup.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-03-31 17:44:42 +03:00

stylesheet.dm

Improves cult conversion

2015-03-05 23:58:56 -05:00

world.dm

Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.

2015-03-28 11:01:11 +10:30