diff --git a/src/character_attire.cpp b/src/character_attire.cpp index 45289d0ef65e1..6202d8dfe50b9 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -1105,12 +1105,13 @@ ret_val outfit::power_armor_conflicts( const item &clothing ) const } } } else { - // Only headgear can be worn with power armor, except other power armor components. + // You can only wear headgear or non-covering items with power armor, except other power armor components. // You can't wear headgear if power armor helmet is already sitting on your head. bool has_helmet = false; - if( !clothing.has_flag( flag_POWERARMOR_COMPATIBLE ) && ( is_wearing_power_armor( &has_helmet ) && - ( has_helmet || !( clothing.covers( body_part_head ) || clothing.covers( body_part_mouth ) || - clothing.covers( body_part_eyes ) ) ) ) ) { + if( !clothing.get_covered_body_parts().none() && !clothing.has_flag( flag_POWERARMOR_COMPATIBLE ) && + ( is_wearing_power_armor( &has_helmet ) && + ( has_helmet || !( clothing.covers( body_part_head ) || clothing.covers( body_part_mouth ) || + clothing.covers( body_part_eyes ) ) ) ) ) { return ret_val::make_failure( _( "Can't wear %s with power armor!" ), clothing.tname() ); } }