PsiOmegaDelta 9d6c99aaf3 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	html/changelogs/.all_changelog.yml

2015-10-27 13:08:33 +01:00

..

effects

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

2015-10-27 13:08:33 +01:00

items

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

2015-10-25 20:28:48 +01:00

random

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

structures

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2

2015-10-15 07:08:16 -04:00

buckling.dm

Fixes beds occasionally buckling in odd directions

2015-09-19 15:27:24 +02:00

empulse.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-11 08:21:06 +02:00

explosion_recursive.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

explosion.dm

Multi-Z.

2015-08-30 14:15:20 -07:00

items.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2

2015-10-15 07:08:16 -04:00

objs.dm

Changes how Topic() calls apply fingerprints.

2015-10-13 08:56:20 +02:00

structures.dm

Updates blob

2015-10-05 18:10:16 +03:00

weapons.dm

…