diff --git a/code/_helpers/game.dm b/code/_helpers/game.dm index 986d63e65b..3af60de770 100644 --- a/code/_helpers/game.dm +++ b/code/_helpers/game.dm @@ -224,7 +224,7 @@ return hear var/mobs_radio_range_fired = 1 //CHOMPEdit -/proc/get_mobs_in_radio_ranges(var/list/obj/item/device/radio/radios, var/ghosts_can_hear = TRUE) +/proc/get_mobs_in_radio_ranges(var/list/obj/item/device/radio/radios) set background = 1 var/our_iter = num2text(++mobs_radio_range_fired) //CHOMPEdit @@ -251,7 +251,7 @@ var/mobs_radio_range_fired = 1 //CHOMPEdit var/turf/T = get_turf(M) if(istype(T) && T.temp_check[our_iter]) . += M - else if(istype(M,/mob/observer) && ghosts_can_hear) //Give ghosts global hearing. + else if(istype(M,/mob/observer)) //Give ghosts global hearing. . += M CHECK_TICK for(var/turf/T in speaker_coverage) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index c82f5defc3..4906c3b8c5 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -339,7 +339,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/vmask, var/list/vmessage_pieces, var/obj/item/device/radio/radio, var/list/message_pieces, var/name, var/job, var/realname, var/vname, var/data, var/compression, var/list/level, var/freq, var/verbage = "says", - var/list/forced_radios, var/ghosts_can_hear = TRUE) //CHOMPEdit + var/list/forced_radios) /* ###### Prepare the radio connection ###### */ @@ -390,7 +390,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept radios |= R // Get a list of mobs who can hear from the radios we collected. - var/list/receive = get_mobs_in_radio_ranges(radios,ghosts_can_hear) //CHOMPEdit + var/list/receive = get_mobs_in_radio_ranges(radios) /* ###### Organize the receivers into categories for displaying the message ###### */ diff --git a/code/game/machinery/telecomms/broadcaster_ch.dm b/code/game/machinery/telecomms/broadcaster_ch.dm index 1211d4f467..6875970519 100644 --- a/code/game/machinery/telecomms/broadcaster_ch.dm +++ b/code/game/machinery/telecomms/broadcaster_ch.dm @@ -27,10 +27,9 @@ // Where are we able to hear from (and talk to, since we're AIO) anyway? //var/map_levels = using_map.get_map_levels(z, TRUE, overmap_range) - var/ghostshear = FALSE + if("[signal.data["level"]]" == "[z]") signal.data["level"] = list(0) - ghostshear = TRUE else signal.data["level"] = list(z) @@ -69,6 +68,5 @@ connection.frequency, signal.data["verb"], signal.data["language"], - forced_radios, - ghosts_can_hear = ghostshear + forced_radios ) \ No newline at end of file