From fc249c5561ffab9ee96b9a3a5e7afe4e2d99e95c Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Sat, 25 Apr 2020 22:28:52 -0400
Subject: [PATCH] Remove unnecessary code, replace with area enter messages

---
 code/game/area/areas_vr.dm                  | 19 +++++++++++++------
 code/game/machinery/telecomms/presets_vr.dm |  5 +++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/code/game/area/areas_vr.dm b/code/game/area/areas_vr.dm
index d422c1cd0f..6c4948fd4f 100644
--- a/code/game/area/areas_vr.dm
+++ b/code/game/area/areas_vr.dm
@@ -1,6 +1,13 @@
-/area/shuttle_arrived()
-	.=..()
-	for(var/obj/machinery/telecomms/relay/R in contents)
-		R.reset_z()
-	for(var/obj/machinery/power/apc/A in contents)
-		A.update_area()
+/area
+	var/enter_message
+	var/exit_message
+
+/area/Entered(var/atom/movable/AM, oldLoc)
+	. = ..()
+	if(enter_message && ismob(AM))
+		to_chat(AM, enter_message)
+
+/area/Exited(var/atom/movable/AM, newLoc)
+	. = ..()
+	if(exit_message && ismob(AM))
+		to_chat(AM, exit_message)
diff --git a/code/game/machinery/telecomms/presets_vr.dm b/code/game/machinery/telecomms/presets_vr.dm
index 01a07a5f5e..3b252f92ce 100644
--- a/code/game/machinery/telecomms/presets_vr.dm
+++ b/code/game/machinery/telecomms/presets_vr.dm
@@ -4,5 +4,6 @@
 	produces_heat = 0
 	autolinkers = list("hb_relay")
 
-/obj/machinery/telecomms/relay/proc/reset_z()
-	listening_level = z
+/obj/machinery/telecomms/relay/onTransitZ(oldz, newz)
+	. = ..()
+	listening_level = newz