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

..

diseases

code/datums

2015-05-29 20:13:42 +01:00

helper_datums

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

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

wires

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-22 21:01:26 +02:00

ai_law_sets.dm

Relocates drone law update to the new law set location.

2015-07-08 08:58:38 +02:00

ai_laws.dm

Rewording of maintenance drones

2015-07-05 00:07:55 +02:00

browser.dm

…

computerfiles.dm

…

datacore.dm

Removed the last few references to MODE, fixed some oversights with player_is_antag().

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

datumvars.dm

code/datums

2015-05-29 20:13:42 +01:00

disease.dm

Attempting to guarantee immunity to viruses for virus_immune var.

2015-05-25 15:52:51 +09:30

mind.dm

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

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

mixed.dm

Powernets

2014-09-07 01:10:22 -04:00

modules.dm

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

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

organs.dm

…

recipe.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

sun.dm

finishes work on adapting the goon process scheduler for BS12.

2015-03-04 05:14:36 -05:00

supplypacks.dm

Removes the RUST engine.

2015-07-01 15:50:55 +09:30