Prefixed all disability defines with DISABILITY_ to fix a name collision

2017-12-24 15:03:30 -06:00
parent 2378235f51
commit 164db7ae9b
83 changed files with 957 additions and 9 deletions
@@ -115,7 +115,11 @@ structure_check() searches for nearby cultist structures required for the invoca
 					continue
 				if(ishuman(L))
 					var/mob/living/carbon/human/H = L
+<<<<<<< HEAD
 					if((H.disabilities & MUTE) || H.silent)
+=======
+					if((H.has_disability(DISABILITY_MUTE)) || H.silent)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 						continue
 				if(L.stat)
 					continue