PsiOmega 570806046b Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/custom_sprites.dm
	code/modules/organs/organ_stump.dm
	code/setup.dm

2015-08-10 17:56:14 +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

…

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

…