From 63f3046a434d76ff59379eaa9000424b5cf4cc81 Mon Sep 17 00:00:00 2001 From: Lostlarry Date: Tue, 19 Nov 2019 20:55:40 +0100 Subject: [PATCH 1/2] stupid intercom nonsense --- code/game/objects/items/devices/radio/intercom.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 50d0e8eb6aa9..2c64ecc9bf39 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -6,8 +6,7 @@ w_class = WEIGHT_CLASS_BULKY canhear_range = 2 var/number = 0 - var/anyai = 1 - var/mob/living/silicon/ai/ai = list() + var/anyai = 1 //it literaly does nothing but the the intercomms in ai core set to one which makes it anoying to remove var/last_tick //used to delay the powercheck dog_fashion = null var/unfastened = FALSE @@ -114,11 +113,8 @@ /obj/item/radio/intercom/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode) - . = ..() if (message_mode == MODE_INTERCOM) return // Avoid hearing the same thing twice - if(!anyai && !(speaker in ai)) - return ..() /obj/item/radio/intercom/process() From ce79291b2dace8450f074e7635859c473241ce0a Mon Sep 17 00:00:00 2001 From: Lostlarry Date: Tue, 19 Nov 2019 22:34:30 +0100 Subject: [PATCH 2/2] let's not be rash --- code/game/objects/items/devices/radio/intercom.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 2c64ecc9bf39..590b3ddbcab5 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -6,7 +6,8 @@ w_class = WEIGHT_CLASS_BULKY canhear_range = 2 var/number = 0 - var/anyai = 1 //it literaly does nothing but the the intercomms in ai core set to one which makes it anoying to remove + var/anyai = 1 + var/mob/living/silicon/ai/ai = list() var/last_tick //used to delay the powercheck dog_fashion = null var/unfastened = FALSE @@ -115,6 +116,8 @@ /obj/item/radio/intercom/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode) if (message_mode == MODE_INTERCOM) return // Avoid hearing the same thing twice + if(!anyai && !(speaker in ai)) // set the intercomms in AI cores to 0 when this gets implemented + return ..() /obj/item/radio/intercom/process()