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

..

effects

Merge branch 'dev' into ofChemistryAndStuff

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

items

Merge branch 'dev' into ofChemistryAndStuff

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

random

Tweaks random gun spawners and supply packs

2015-03-09 15:47:25 -04:00

structures

Merge branch 'dev' into ofChemistryAndStuff

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

buckling.dm

Fixed buckling into chair not changing mob's facing if he had permafacing set.

2015-02-26 12:09:23 +03:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Merge pull request #8604 from Zuhayr/limbs

2015-03-31 08:38:54 +03:00

objs.dm

Partial breathing refactor

2015-03-09 00:09:34 -04:00

structures.dm

Replaced display_name with name, worked on severing limbs and damage propagation.

2015-03-25 19:07:22 +10:30

weapons.dm

…