Skip to content

Commit

Permalink
Holocall Change (#3684)
Browse files Browse the repository at this point in the history
## About The Pull Request
Holocalls now tell you they are coming from a location rather than from
fruity sarathi woman

## Changelog

:cl:
add: Holocalls now tell you they are coming from a location
/:cl:
  • Loading branch information
Erikafox authored Nov 1, 2024
1 parent c0a75f0 commit 4f71b9b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions code/datums/holocall.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/hologram.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4f71b9b

Please sign in to comment.