From 6dd82bb423cb8d3adb6b5f291aab3857ccc0f62e Mon Sep 17 00:00:00 2001
From: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Date: Wed, 30 Oct 2024 18:50:29 -0400
Subject: [PATCH 1/2] wa

---
 code/datums/holocall.dm         | 3 +++
 code/game/machinery/hologram.dm | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index c5f907f9c31d..9c3e0b4a1fe9 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -34,6 +34,8 @@
 
 /datum/holocall
 	var/mob/living/user	//the one that called
+	///area of the caller
+	var/area/caller_location
 	var/obj/machinery/holopad/calling_holopad	//the one that sent the call
 	var/obj/machinery/holopad/connected_holopad	//the one that answered the call (may be null)
 	var/list/dialed_holopads	//all things called, will be cleared out to just connected_holopad once answered
@@ -48,6 +50,7 @@
 /datum/holocall/New(mob/living/caller, obj/machinery/holopad/calling_pad, list/callees, elevated_access = FALSE)
 	call_start_time = world.time
 	user = caller
+	caller_location = get_area_name(caller)
 	calling_pad.outgoing_call = src
 	calling_holopad = calling_pad
 	dialed_holopads = list()
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 0e6bc6ed6a6d..2a68312c157f 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -237,7 +237,7 @@ Possible to do for anyone motivated enough:
 	for(var/I in holo_calls)
 		var/datum/holocall/HC = I
 		var/list/call_data = list(
-			caller = HC.user,
+			caller = HC.caller_location,
 			connected = HC.connected_holopad == src ? TRUE : FALSE,
 			ref = REF(HC)
 		)

From 38424dd2214afb15ebad35e1f4b805303188712d Mon Sep 17 00:00:00 2001
From: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Date: Wed, 30 Oct 2024 18:51:52 -0400
Subject: [PATCH 2/2] Update hologram.dm

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

diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 2a68312c157f..f5d4959083dc 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -378,7 +378,7 @@ Possible to do for anyone motivated enough:
 	for(var/I in holo_calls)
 		var/datum/holocall/HC = I
 		if(HC.connected_holopad != src)
-			caller_history = get_area_name(HC.calling_holopad)
+			caller_history = HC.caller_location
 			if(force_answer_call && world.time > (HC.call_start_time + (HOLOPAD_MAX_DIAL_TIME / 2)))
 				HC.Answer(src)
 				break