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

..

diseases

Merge with dev.

2015-03-30 08:36:52 +10:30

helper_datums

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

wires

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

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

ai_law_sets.dm

Changes the silicon is_malf/is_traitor procs to utilize the new antag datums.

2015-03-25 19:27:03 +01:00

ai_laws.dm

Changes the silicon is_malf/is_traitor procs to utilize the new antag datums.

2015-03-22 17:43:20 +01:00

browser.dm

…

computerfiles.dm

…

datacore.dm

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

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

datumvars.dm

Merge with dev.

2015-03-30 08:36:52 +10:30

datumvars.dm.orig

Merge with dev.

2015-03-30 08:36:52 +10:30

disease.dm

…

mind.dm

Merge with dev.

2015-03-30 08:36:52 +10:30

mixed.dm

Powernets

2014-09-07 01:10:22 -04:00

modules.dm

…

organs.dm

…

recipe.dm

Chemistry commit

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

sun.dm

finishes work on adapting the goon process scheduler for BS12.

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

supplypacks.dm

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

2015-03-16 21:21:56 +00:00