Kelenius 24ef7752cd Merge branch 'Baystation12/dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm

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

..

effects

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

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

items

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

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

random

Tweaks random gun spawners and supply packs

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

structures

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +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

Preliminary work on converting all monkeys to a human subspecies.

2015-03-25 02:15:45 +10:30

objs.dm

Partial breathing refactor

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

structures.dm

…

weapons.dm

…