Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Holocall Change #3684

Merged
merged 2 commits into from
Nov 1, 2024
Merged

Holocall Change #3684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dd82bb
wa
Erikafox Oct 30, 2024
38424dd
Update hologram.dm
Erikafox Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/datums/holocall.dm
View file
Open in desktop
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
View file
Open in desktop
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
Loading