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

..

projectile

…

disintegrate.dm

…

ethereal_jaunt.dm

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

2015-07-14 08:21:12 +02:00

flesh_to_stone.dm

…

genetic.dm

…

harvest.dm

…

horsemask.dm

…

mind_transfer.dm

Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.

2015-07-14 05:19:01 +09:30

shift.dm

…

subjugate.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

targeted.dm

…