PsiOmegaDelta 9698def0e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/nano/modules/human_appearance.dm

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

..

chem

Fixes #9585

2015-06-21 00:44:38 -04:00

decals

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

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

spawners

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

aliens.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

bump_teleporter.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

effect_system.dm

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

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

explosion_particles.dm

…

gibs.dm

objects/effects, objects/structures

2015-05-30 14:37:40 +01:00

glowshroom.dm

…

landmarks.dm

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

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

manifest.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

mines.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

misc.dm

…

overlays.dm

Dev merge.

2015-05-11 18:45:14 +09:30

portals.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

spiders.dm

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-05 08:52:44 +01:00

step_triggers.dm

…