PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

2015-10-11 17:17:41 +02: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

Fixes backup power test light

2015-10-09 17:44:30 +02:00

ai_law_sets.dm

Law spelling corrections, removes some law sets from the law manager overview.

2015-07-14 09:01:13 +02:00

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

revert chargen rendering rework

2015-08-01 11:35:53 +01:00

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 with master.

2015-08-18 11:31:10 -07: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

Moves supply pack check down to atom

2015-07-22 13:05:26 +03:00