From 9123f45eab32513953e0f39c1769a90df108fa65 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Fri, 21 Jul 2017 16:25:19 -0700 Subject: [PATCH] Fixes harmonicas acting like muzzles (and runtiming instead of properly muting you too.) (#29393) --- code/game/objects/items.dm | 2 ++ code/game/objects/items/devices/instruments.dm | 6 ++++++ code/modules/clothing/clothing.dm | 5 ----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 30f6afd086f..144a7f41ef8 100644 --- a/code/game/objects/items.dm +++ b/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) diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index 435150aff1b..1847c21f3d7 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/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, "You stop playing the harmonica to talk...") + 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." diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 22bff9bd966..af0a4a7518a 100644 --- a/code/modules/clothing/clothing.dm +++ b/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())