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
@@ -4,7 +4,11 @@
 	possible_locs = list("chest")

 /datum/surgery/lipoplasty/can_start(mob/user, mob/living/carbon/target)
+<<<<<<< HEAD
 	if(target.disabilities & FAT)
+=======
+	if(target.has_disability(DISABILITY_FAT))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return 1
 	return 0