PsiOmegaDelta 34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm

2015-07-14 08:21:12 +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 the atom_pool, now datum_pool, to handle any datum object.

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

aliens.dm

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

2015-06-26 20:28:47 +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

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

gibs.dm

objects/effects, objects/structures

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

glowshroom.dm

Renamed some files, did some path replacements

2015-02-04 10:48:18 +10:30

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

More file structuring.

2012-09-05 22:44:48 +00:00

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-freeze' into dev

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

step_triggers.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00