mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-18 06:01:56 +00:00
Merge pull request #6136 from Novacat/nova-alerts
Shortwave and Relay Tweaks
This commit is contained in:
@@ -371,6 +371,10 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
|
|||||||
var/broadcasting = 1
|
var/broadcasting = 1
|
||||||
var/receiving = 1
|
var/receiving = 1
|
||||||
|
|
||||||
|
/obj/machinery/telecomms/relay/forceMove(var/newloc)
|
||||||
|
. = ..(newloc)
|
||||||
|
listening_level = z
|
||||||
|
|
||||||
/obj/machinery/telecomms/relay/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
|
/obj/machinery/telecomms/relay/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
|
||||||
|
|
||||||
// Add our level and send it back
|
// Add our level and send it back
|
||||||
|
|||||||
@@ -419,7 +419,7 @@ var/global/list/default_medbay_channels = list(
|
|||||||
subspace_transmission = FALSE
|
subspace_transmission = FALSE
|
||||||
return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
|
return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
|
||||||
src, message, displayname, jobname, real_name, M.voice_name,
|
src, message, displayname, jobname, real_name, M.voice_name,
|
||||||
signal.transmission_method, signal.data["compression"], list(position.z), connection.frequency,verb,speaking)
|
signal.transmission_method, signal.data["compression"], GetConnectedZlevels(position.z), connection.frequency,verb,speaking)
|
||||||
|
|
||||||
/* ###### Intercoms and station-bounced radios ###### */
|
/* ###### Intercoms and station-bounced radios ###### */
|
||||||
|
|
||||||
@@ -478,10 +478,9 @@ var/global/list/default_medbay_channels = list(
|
|||||||
|
|
||||||
//THIS IS TEMPORARY. YEAH RIGHT
|
//THIS IS TEMPORARY. YEAH RIGHT
|
||||||
if(!connection) return 0 //~Carn
|
if(!connection) return 0 //~Carn
|
||||||
|
|
||||||
return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
|
return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
|
||||||
src, message, displayname, jobname, real_name, M.voice_name,
|
src, message, displayname, jobname, real_name, M.voice_name,
|
||||||
filter_type, signal.data["compression"], list(position.z), connection.frequency,verb,speaking)
|
filter_type, signal.data["compression"], GetConnectedZlevels(position.z), connection.frequency,verb,speaking)
|
||||||
|
|
||||||
|
|
||||||
/obj/item/device/radio/hear_talk(mob/M as mob, msg, var/verb = "says", var/datum/language/speaking = null)
|
/obj/item/device/radio/hear_talk(mob/M as mob, msg, var/verb = "says", var/datum/language/speaking = null)
|
||||||
|
|||||||
37
html/changelogs/Novacat - shortwave.yml
Normal file
37
html/changelogs/Novacat - shortwave.yml
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
################################
|
||||||
|
# Example Changelog File
|
||||||
|
#
|
||||||
|
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||||
|
#
|
||||||
|
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||||
|
# When it is, any changes listed below will disappear.
|
||||||
|
#
|
||||||
|
# Valid Prefixes:
|
||||||
|
# bugfix
|
||||||
|
# wip (For works in progress)
|
||||||
|
# tweak
|
||||||
|
# soundadd
|
||||||
|
# sounddel
|
||||||
|
# rscadd (general adding of nice things)
|
||||||
|
# rscdel (general deleting of nice things)
|
||||||
|
# imageadd
|
||||||
|
# imagedel
|
||||||
|
# maptweak
|
||||||
|
# spellcheck (typo fixes)
|
||||||
|
# experiment
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Novacat
|
||||||
|
|
||||||
|
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
# Any changes you've made. See valid prefix list above.
|
||||||
|
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||||
|
# SCREW THIS UP AND IT WON'T WORK.
|
||||||
|
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||||
|
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||||
|
changes:
|
||||||
|
- tweak: "Shortwave radios now can transmit across connected Z levels."
|
||||||
|
- tweak: "Relays on moving platforms (shuttles) will now function."
|
||||||
Reference in New Issue
Block a user