Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clearer message when safecracking with music playing #38003

Merged
merged 2 commits into from
Feb 14, 2020
Merged

Clearer message when safecracking with music playing #38003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8b26e4
Avoid double activation penalty for mp3 player
wapcaplet Feb 13, 2020
82f4991
Mention music instead of earbuds in message
wapcaplet Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/iexamine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@ void iexamine::safe( player &p, const tripoint &examp )
add_msg( m_info, _( "You can't crack a safe while deaf!" ) );
return;
} else if( p.has_effect( effect_earphones ) ) {
add_msg( m_info, _( "You can't crack a safe with earbuds on!" ) );
add_msg( m_info, _( "You can't crack a safe while listening to music!" ) );
return;
} else if( query_yn( _( "Attempt to crack the safe?" ) ) ) {
add_msg( m_info, _( "You start cracking the safe." ) );
Expand Down
2 changes: 0 additions & 2 deletions src/iuse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4110,7 +4110,6 @@ int iuse::mp3( player *p, item *it, bool, const tripoint & )
p->add_msg_if_player( m_info, _( "You put in the earbuds and start listening to music." ) );
if( it->typeId() == "mp3" ) {
it->convert( "mp3_on" ).active = true;
p->mod_moves( -200 );
} else if( it->typeId() == "smart_phone" ) {
it->convert( "smartphone_music" ).active = true;
} else if( it->typeId() == "afs_atomic_smartphone" ) {
Expand Down Expand Up @@ -4195,7 +4194,6 @@ int iuse::mp3_on( player *p, item *it, bool t, const tripoint &pos )
if( it->typeId() == "mp3_on" ) {
p->add_msg_if_player( _( "The mp3 player turns off." ) );
it->convert( "mp3" ).active = false;
p->mod_moves( -200 );
} else if( it->typeId() == "smartphone_music" ) {
p->add_msg_if_player( _( "The phone turns off." ) );
it->convert( "smart_phone" ).active = false;
Expand Down