Skip to content

Commit

Permalink
Merge pull request #78814 from EliadOArias/Fix_Bioshock
Browse files Browse the repository at this point in the history
fix bio shock with unarmed weapon like knuckle
GuardianDll authored Jan 11, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 66c2cc9 + 6a71a62 commit 40a53b3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/melee.cpp
Original file line number Diff line number Diff line change
@@ -2221,7 +2221,7 @@ std::string Character::melee_special_effects( Creature &t, damage_instance &d, i
std::string target = t.disp_name();

if( has_active_bionic( bio_shock ) && get_power_level() >= bio_shock->power_trigger &&
( weap.is_null() || weapon.conductive() ) ) {
( weap.is_null() || weap.conductive() || weapon.conductive() ) ) {
mod_power_level( -bio_shock->power_trigger );
d.add_damage( STATIC( damage_type_id( "electric" ) ), rng( 2, 10 ) );

0 comments on commit 40a53b3

Please sign in to comment.