From 8973ddf6adc88a2077552daa00d367118eb5771d Mon Sep 17 00:00:00 2001 From: Wise Monster Date: Tue, 2 Jul 2024 20:17:55 -0400 Subject: [PATCH] Ultimate fix for fallen radio --- code/__DEFINES/is_helpers.dm | 1 + code/game/objects/items/radio/radio.dm | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index a6b73eeb5e53a..2dcd2f733ba4e 100755 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -91,6 +91,7 @@ GLOBAL_VAR_INIT(refid_filter, TYPEID(filter(type="angular_blur"))) #define issurvivorjob(J) (istype(J, /datum/job/survivor)) #define ischaplainjob(J) (istype(J, /datum/job/survivor/chaplain)) #define isxenosjob(J) (istype(J, /datum/job/xenomorph)) +#define isfallenjob(J) (istype(J, /datum/job/fallen)) //Monkey sub-species diff --git a/code/game/objects/items/radio/radio.dm b/code/game/objects/items/radio/radio.dm index 243b0a3baff82..fa1a9719a657f 100644 --- a/code/game/objects/items/radio/radio.dm +++ b/code/game/objects/items/radio/radio.dm @@ -253,6 +253,10 @@ if(!talking_movable.IsVocal()) return + var/mob/living/carbon/human/talker = talking_movable + if(isfallenjob(talker.job)) // prevents any of the valhalla jobs from talking to the living + return + if(use_command) spans |= SPAN_COMMAND