Merge pull request #2095 from Citadel-Station-13/upstream-merge-29393

[MIRROR] Fixes harmonicas acting like muzzles (and runtiming instead of properly muting you too.)

code/game/objects/items.dm

@@ -204,6 +204,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 		msg += "*--------*"
 		to_chat(user, msg)
 
+/obj/item/proc/speechModification(message)		//For speech modification by mask slot items.
+	return message
 
 /obj/item/attack_self(mob/user)
 	interact(user)

code/game/objects/items/devices/instruments.dm

@@ -140,6 +140,12 @@
 	w_class = WEIGHT_CLASS_SMALL
 	actions_types = list(/datum/action/item_action/instrument)
 
+/obj/item/device/instrument/harmonica/speechModification(message)
+	if(song.playing && ismob(loc))
+		to_chat(loc, "<span class='warning'>You stop playing the harmonica to talk...</span>")
+		song.playing = FALSE
+	return message
+
 /obj/item/device/instrument/bikehorn
 	name = "gilded bike horn"
 	desc = "An exquisitely decorated bike horn, capable of honking in a variety of notes."

code/modules/clothing/clothing.dm

@@ -331,11 +331,6 @@ BLIND     // can't see anything
 		var/mob/M = loc
 		M.update_inv_wear_mask()
 
-
-//Override this to modify speech like luchador masks.
-/obj/item/clothing/mask/proc/speechModification(message)
-	return message
-
 //Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
 /obj/item/clothing/mask/proc/adjustmask(mob/living/user)
 	if(user && user.incapacitated())