GinjaNinja32 be2279106f Merge remote-tracking branch 'upstream/dev' into vv ...

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/admin/view_variables/topic.dm

2015-09-10 03:06:27 +01:00

..

diseases

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

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

helper_datums

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

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

wires

Synths now relies on access permissions as well.

2015-08-17 09:12:40 +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

…

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

…

supplypacks.dm

Cleans out (mostly) unused access definitions and makes access lists sorted.

2015-08-21 14:45:45 +02:00