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

..

admin.dm

Antibodies rework.

2015-01-26 05:32:00 +00:00

analyser.dm

Virology rebalance

2015-01-20 09:57:47 +00:00

antibodies.dm

Chemistry commit

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

biohazard destroyer.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

centrifuge.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

curer.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

disease2.dm

Merge pull request #8029 from GinjaNinja32/viro

2015-02-06 00:18:13 +03:00

diseasesplicer.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

dishincubator.dm

Chemistry commit

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

effect.dm

Merge branch 'dev' into ofChemistryAndStuff

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

helpers.dm

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

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

isolator.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

items_devices.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00