PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

2015-10-11 17:17:41 +02:00

..

chem

Fixes #10150

2015-07-13 11:44:47 +03:00

decals

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

2015-06-17 09:33:34 +02:00

spawners

Updates changelog, fixes comment

2015-10-09 11:39:22 -04:00

aliens.dm

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

2015-06-26 20:28:47 +02:00

bump_teleporter.dm

…

effect_system.dm

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

2015-06-07 10:51:41 +02:00

explosion_particles.dm

Explosion particle GC.

2015-08-09 12:35:07 +02:00

gibs.dm

…

glowshroom.dm

…

landmarks.dm

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

2015-06-22 16:59:19 +02:00

manifest.dm

…

mines.dm

…

misc.dm

…

overlays.dm

…

portals.dm

…

spiders.dm

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

2015-06-26 20:28:47 +02:00

step_triggers.dm

…