mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-21 20:20:33 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync
This commit is contained in:
@@ -117,7 +117,7 @@
|
||||
/obj/item/mod/control/proc/delete_link_visual(mob/living/old_user)
|
||||
return delete_link_visual_generic(mod_link, old_user)
|
||||
|
||||
/obj/item/mod/control/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods, message_range)
|
||||
/obj/item/mod/control/Hear(atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods, message_range)
|
||||
. = ..()
|
||||
if(speaker != wearer && speaker != ai_assistant)
|
||||
return
|
||||
@@ -300,7 +300,7 @@
|
||||
old_user.update_worn_neck()
|
||||
return delete_link_visual_generic(mod_link, old_user)
|
||||
|
||||
/obj/item/clothing/neck/link_scryer/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods, message_range)
|
||||
/obj/item/clothing/neck/link_scryer/Hear(atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods, message_range)
|
||||
. = ..()
|
||||
if(speaker != loc)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user