From 0418e51a210fa0e78e1aa2d18d5d1d15f5523854 Mon Sep 17 00:00:00 2001 From: datlo Date: Mon, 3 Sep 2018 16:32:20 +0100 Subject: [PATCH 1/2] Adds font check to the megaphone Megaphone now carries over the user's font (wingdings, comic sans, and any other font in mind.speech_span) --- code/game/objects/items/devices/megaphone.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 5fa97f07d62..26933257969 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -10,6 +10,7 @@ var/spamcheck = 0 var/emagged = 0 var/insults = 0 + var/span = "" var/list/insultmsg = list("FUCK EVERYONE!", "I'M A TATER!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!") /obj/item/megaphone/attack_self(mob/living/user as mob) @@ -32,6 +33,10 @@ if(H && H.mind && H.mind.miming) to_chat(user, "Your vow of silence prevents you from speaking.") return + if(H.mind) + span = H.mind.speech_span + if((COMIC in H.mutations) || (locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in H.internal_organs)) + span = "sans" if(spamcheck) to_chat(user, "\The [src] needs to recharge!") return @@ -51,6 +56,8 @@ else to_chat(user, "*BZZZZzzzzzt*") else + if(span) + message = "[message]" saymsg(user, message) spamcheck = 1 From 5c3aeef45eaf409519792e0313d837fdb23827b4 Mon Sep 17 00:00:00 2001 From: datlo Date: Tue, 4 Sep 2018 11:47:15 +0100 Subject: [PATCH 2/2] replace locate check --- code/game/objects/items/devices/megaphone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 26933257969..9cde3e9aa6d 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -35,7 +35,7 @@ return if(H.mind) span = H.mind.speech_span - if((COMIC in H.mutations) || (locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in H.internal_organs)) + if((COMIC in H.mutations) || H.get_int_organ(/obj/item/organ/internal/cyberimp/brain/clown_voice)) span = "sans" if(spamcheck) to_chat(user, "\The [src] needs to recharge!")