Prefixed all disability defines with DISABILITY_ to fix a name collision

2017-12-24 11:45:45 -05:00
parent 2378235f51
commit 164db7ae9b
83 changed files with 957 additions and 9 deletions
@@ -51,7 +51,11 @@
 		var/datum/disease/D
 		if(!advanced_virus)
 			if(virus_type == /datum/disease/dnaspread)		//Dnaspread needs strain_data set to work.
+<<<<<<< HEAD
 				if(!H.dna || (H.disabilities & BLIND))	//A blindness disease would be the worst.
+=======
+				if(!H.dna || (H.has_disability(DISABILITY_BLIND)))	//A blindness disease would be the worst.
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 					continue
 				D = new virus_type()
 				var/datum/disease/dnaspread/DS = D