cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix ghost double comms with new link allinone"

Browse Source
This commit is contained in:
cadyn
2021-03-05 14:00:51 -08:00
committed by GitHub
parent 976d43ef96
commit fc25da825e
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/_helpers/game.dm
View File

@@ -224,7 +224,7 @@
return hear return hear
var/mobs_radio_range_fired = 1 //CHOMPEdit 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 set background = 1
var/our_iter = num2text(++mobs_radio_range_fired) //CHOMPEdit 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) var/turf/T = get_turf(M)
if(istype(T) && T.temp_check[our_iter]) if(istype(T) && T.temp_check[our_iter])
. += M . += 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 . += M
CHECK_TICK CHECK_TICK
for(var/turf/T in speaker_coverage) for(var/turf/T in speaker_coverage)

4
code/game/machinery/telecomms/broadcaster.dm
View File

@@ -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/vmask, var/list/vmessage_pieces, var/obj/item/device/radio/radio,
var/list/message_pieces, var/name, var/job, var/realname, var/vname, 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/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 ###### */ /* ###### Prepare the radio connection ###### */
@@ -390,7 +390,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
radios |= R radios |= R
// Get a list of mobs who can hear from the radios we collected. // 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 ###### */ /* ###### Organize the receivers into categories for displaying the message ###### */

6
code/game/machinery/telecomms/broadcaster_ch.dm
View File

@@ -27,10 +27,9 @@
// Where are we able to hear from (and talk to, since we're AIO) anyway? // 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/map_levels = using_map.get_map_levels(z, TRUE, overmap_range)
var/ghostshear = FALSE
if("[signal.data["level"]]" == "[z]") if("[signal.data["level"]]" == "[z]")
signal.data["level"] = list(0) signal.data["level"] = list(0)
ghostshear = TRUE
else else
signal.data["level"] = list(z) signal.data["level"] = list(z)
@@ -69,6 +68,5 @@
connection.frequency, connection.frequency,
signal.data["verb"], signal.data["verb"],
signal.data["language"], signal.data["language"],
forced_radios, forced_radios
ghosts_can_hear = ghostshear
) )