Prefixed all disability defines with DISABILITY_ to fix a name collision

This commit is contained in:
Jordan Brown
2017-12-24 15:03:30 -06:00
committed by CitadelStationBot
parent 2378235f51
commit 164db7ae9b
83 changed files with 957 additions and 9 deletions
@@ -217,7 +217,11 @@
C = owner
no_update = 0
<<<<<<< HEAD
if(C.disabilities & HUSK)
=======
if(C.has_disability(DISABILITY_HUSK))
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
species_id = "husk" //overrides species_id
dmg_overlay_type = "" //no damage overlay shown when husked
should_draw_gender = FALSE
+4
View File
@@ -61,7 +61,11 @@
C = owner
real_name = C.real_name
<<<<<<< HEAD
if(C.disabilities & HUSK)
=======
if(C.has_disability(DISABILITY_HUSK))
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
real_name = "Unknown"
hair_style = "Bald"
facial_hair_style = "Shaved"