From a8b26e4f919188feb06cbfef1801edc1a3348bc5 Mon Sep 17 00:00:00 2001
From: Eric Pierce <wapcaplet88@gmail.com>
Date: Thu, 13 Feb 2020 14:26:30 -0700
Subject: [PATCH 1/2] Avoid double activation penalty for mp3 player

This makes mp3 players take the same amount of time to activate or
deactivate as music-playing smartphones.

PR #37584 added 200 (de-)activation time to the smartphones, but
since the mp3 player already had its own 200 move cost, this made the
mp3 player take twice as long as the other devices.
---
 src/iuse.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/iuse.cpp b/src/iuse.cpp
index d9bfb3f1e4a54..548fd419c2fa6 100644
--- a/src/iuse.cpp
+++ b/src/iuse.cpp
@@ -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" ) {
@@ -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;

From 82f4991b96f27e1fce4f943d18da86410fced274 Mon Sep 17 00:00:00 2001
From: Eric Pierce <wapcaplet88@gmail.com>
Date: Thu, 13 Feb 2020 15:08:30 -0700
Subject: [PATCH 2/2] Mention music instead of earbuds in message

Previous message was vague

Fixes #37996
---
 src/iexamine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/iexamine.cpp b/src/iexamine.cpp
index f32015d7511ac..74bbac95f1d86 100644
--- a/src/iexamine.cpp
+++ b/src/iexamine.cpp
@@ -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." ) );