Skip to content

Commit

Permalink
Merge pull request #33947 from anothersimulacrum/jumper-cable
Browse files Browse the repository at this point in the history
Fix jumper cable not working without bio_cable CBM
  • Loading branch information
ZhilkinSerg authored Sep 10, 2019
2 parents 4a420ca + d035681 commit 8c2d6d8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/iuse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8906,9 +8906,10 @@ int iuse::cable_attach( player *p, item *it, bool, const tripoint & )
uilist kmenu;
kmenu.text = _( "Using cable:" );
kmenu.addentry( 0, true, -1, _( "Detach and re-spool the cable" ) );
kmenu.addentry( 1, ( paying_out || cable_cbm ) && !solar_pack &&
!UPS, -1, _( "Attach loose end to vehicle" ) );

if( has_bio_cable && loose_ends ) {
kmenu.addentry( 1, ( paying_out || cable_cbm ) && !solar_pack &&
!UPS, -1, _( "Attach loose end to vehicle" ) );
kmenu.addentry( 2, !cable_cbm, -1, _( "Attach loose end to self" ) );
if( wearing_solar_pack ) {
kmenu.addentry( 3, !solar_pack && !paying_out && !UPS, -1, _( "Attach loose end to solar pack" ) );
Expand Down

0 comments on commit 8c2d6d8

Please sign in to comment.