From 1c15971f802b93edc542965d870d6e87124f62e4 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 30 Dec 2019 23:04:02 +0200 Subject: [PATCH] Fixes hivenet not being blocked by radio jammers (#7859) --- code/modules/mob/living/say.dm | 3 +++ html/changelogs/geeves - hivenetfix.yml | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 html/changelogs/geeves - hivenetfix.yml diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index a729fb135f0..a02b2716e95 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -186,6 +186,9 @@ proc/get_radio_key_from_channel(var/channel) // This is broadcast to all mobs with the language, // irrespective of distance or anything else. if(speaking && (speaking.flags & HIVEMIND)) + if(speaking.name == LANGUAGE_VAURCA && within_jamming_range(src)) + to_chat(src, span("warning", "Your head buzzes as your message is blocked with jamming signals.")) + return speaking.broadcast(src,trim(message)) return 1 diff --git a/html/changelogs/geeves - hivenetfix.yml b/html/changelogs/geeves - hivenetfix.yml new file mode 100644 index 00000000000..5393471428b --- /dev/null +++ b/html/changelogs/geeves - hivenetfix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fix Radio Jammers not jamming Vaurcaesian hivenet."