From 1f69679cfb332fbeba04765a0ff629cfd11444d5 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 27 Nov 2019 04:58:05 +0100
Subject: [PATCH 1/2] Ports a few telecomms updates and fixes.

---
 code/game/machinery/telecomms/computers/logbrowser.dm |  2 +-
 code/game/machinery/telecomms/computers/message.dm    |  2 +-
 code/game/machinery/telecomms/machines/bus.dm         |  2 +-
 code/game/machinery/telecomms/machines/hub.dm         |  2 +-
 code/game/machinery/telecomms/machines/relay.dm       | 10 ++++++++++
 code/game/machinery/telecomms/telecomunications.dm    |  1 +
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm
index 5337c7a6f6..77a54e5d94 100644
--- a/code/game/machinery/telecomms/computers/logbrowser.dm
+++ b/code/game/machinery/telecomms/computers/logbrowser.dm
@@ -86,7 +86,7 @@
 					else if(isobj(mobtype))
 						race = "Machinery"
 
-					else if(ispath(mobtype, ))
+					else if(ispath(mobtype, /mob/living/simple_animal)))
 						race = "Domestic Animal"
 
 					else
diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm
index 64f4cc7835..b7737eb6d4 100644
--- a/code/game/machinery/telecomms/computers/message.dm
+++ b/code/game/machinery/telecomms/computers/message.dm
@@ -426,7 +426,7 @@
 						))
 						// this will log the signal and transmit it to the target
 						linkedServer.receive_information(signal, null)
-						usr.log_message("(PDA: [name]) sent \"[custommessage]\" to [signal.format_target()]", LOG_PDA)
+						usr.log_message("(PDA: [name] | [usr.real_name]) sent \"[custommessage]\" to [signal.format_target()]", LOG_PDA)
 
 
 		//Request Console Logs - KEY REQUIRED
diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm
index b92ebc0d7d..ed7c33d50a 100644
--- a/code/game/machinery/telecomms/machines/bus.dm
+++ b/code/game/machinery/telecomms/machines/bus.dm
@@ -35,7 +35,7 @@
 		signal.data["slow"] += rand(1, 5) // slow the signal down only slightly
 
 	// Try sending it!
-	var/list/try_send = list(signal.server_type, /obj/machinery/telecomms/hub, /obj/machinery/telecomms/broadcaster, /obj/machinery/telecomms/bus)
+	var/list/try_send = list(signal.server_type, /obj/machinery/telecomms/hub, /obj/machinery/telecomms/broadcaster)
 
 	var/i = 0
 	for(var/send in try_send)
diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm
index b23c443678..e7e3788774 100644
--- a/code/game/machinery/telecomms/machines/hub.dm
+++ b/code/game/machinery/telecomms/machines/hub.dm
@@ -39,5 +39,5 @@
 	network = "tcommsat"
 	autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "h_relay", "science", "medical",
 	"supply", "service", "common", "command", "engineering", "security",
-	"receiverA", "receiverB", "broadcasterA", "broadcasterB")
+	"receiverA", "receiverB", "broadcasterA", "broadcasterB", "autorelay")
 
diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm
index 9e6716278b..65f70a4f23 100644
--- a/code/game/machinery/telecomms/machines/relay.dm
+++ b/code/game/machinery/telecomms/machines/relay.dm
@@ -49,6 +49,11 @@
 /obj/machinery/telecomms/relay/preset
 	network = "tcommsat"
 
+/obj/machinery/telecomms/relay/Initialize(mapload)
+	. = ..()
+	if(autolinkers.len) //We want lateloaded presets to autolink (lateloaded aways/ruins/shuttles)
+		return INITIALIZE_HINT_LATELOAD
+
 /obj/machinery/telecomms/relay/preset/station
 	id = "Station Relay"
 	autolinkers = list("s_relay")
@@ -74,3 +79,8 @@
 	icon = 'icons/obj/clockwork_objects.dmi'
 	hide = TRUE
 	autolinkers = list("h_relay")
+
+//Generic preset relay
+/obj/machinery/telecomms/relay/preset/auto
+	hide = TRUE
+	autolinkers = list("autorelay")
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index c2fb13c34c..b82b3071a3 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -107,6 +107,7 @@ GLOBAL_LIST_EMPTY(telecomms_list)
 			for(var/x in autolinkers)
 				if(x in T.autolinkers)
 					links |= T
+					T.links |= src
 
 /obj/machinery/telecomms/update_icon()
 	if(on)

From 4640d8495d2f6bd52ae9f2d437bb6d218ae376d3 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 27 Nov 2019 05:14:08 +0100
Subject: [PATCH 2/2] )

---
 code/game/machinery/telecomms/computers/logbrowser.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm
index 77a54e5d94..c1db49605c 100644
--- a/code/game/machinery/telecomms/computers/logbrowser.dm
+++ b/code/game/machinery/telecomms/computers/logbrowser.dm
@@ -86,7 +86,7 @@
 					else if(isobj(mobtype))
 						race = "Machinery"
 
-					else if(ispath(mobtype, /mob/living/simple_animal)))
+					else if(ispath(mobtype, /mob/living/simple_animal))
 						race = "Domestic Animal"
 
 					else