Prefixed all disability defines with DISABILITY_ to fix a name collision
This commit is contained in:
committed by
CitadelStationBot
parent
2378235f51
commit
164db7ae9b
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user