Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge ...

Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme

2015-11-06 17:41:18 -05:00

..

diseases

Cherrypicked xenophage-rewrite mechanics over.

2015-09-21 20:36:45 +09:30

helper_datums

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

wires

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

2015-10-11 17:37:01 +02:00

ai_law_sets.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

ai_laws.dm

Fixes #10488.

2015-08-11 19:36:02 +02:00

browser.dm

…

category.dm

Character setup refactoring.

2015-10-18 17:34:35 +02:00

computerfiles.dm

…

crew.dm

Crew monitor balance and lag fixes.

2015-08-11 09:27:18 +02:00

datacore.dm

Cargo now sorts under their own department in the manifests.

2015-08-24 10:03:15 +02: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' into 150722-TagPairs

2015-08-20 14:09:07 +02:00

mixed.dm

…

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

Department voidsuits can be ordered from cargo

2015-10-11 00:45:39 -04:00