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

..

implant.dm

Merge branch 'dev' into ofChemistryAndStuff

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

implantcase.dm

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

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

implantchair.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

implanter.dm

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

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

implantfreedom.dm

refactor buckling to be more generic

2015-01-12 21:28:31 +00:00

implantpad.dm

…

implantuplink.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00