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

..

Cleanable

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

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

posters

Adds 7 new posters.

2015-03-06 21:14:32 -06:00

cleanable.dm

Bugfix: Actually implement cleanbot targeting.

2013-12-30 21:59:20 -06:00

contraband.dm

Fixes #7598

2015-01-01 15:43:28 -05:00

crayon.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

misc.dm

Chemistry commit

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

remains.dm

Added plant controller.

2015-02-05 15:53:20 +10:30

warning_stripes.dm

…