From bba8fdada96c3a0595accb27b375ef6949e0e571 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 16 Feb 2018 02:28:52 -0500 Subject: [PATCH] more feedback tweaks --- code/game/machinery/hologram.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 3c2c53d68c4..6ea34fbcbf8 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -146,7 +146,7 @@ var/list/holopads = list() for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad != src) - dat += "Answer call from [get_area(HC.calling_holopad)].
" + dat += "Answer call from [get_area(HC.calling_holopad)].
" one_unanswered_call = TRUE else one_answered_call = TRUE @@ -157,10 +157,10 @@ var/list/holopads = list() for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad == src) - dat += "Disconnect call from [HC.user].
" + dat += "Disconnect call from [HC.user].
" - var/datum/browser/popup = new(user, "holopad", name, 300, 130) + var/datum/browser/popup = new(user, "holopad", name, 400, 300) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) popup.open() @@ -211,13 +211,13 @@ var/list/holopads = list() else if(href_list["connectcall"]) var/datum/holocall/call_to_connect = locateUID(href_list["connectcall"]) - if(!qdeleted(call_to_connect)) + if(exists(call_to_connect) && (call_to_connect in holo_calls)) call_to_connect.Answer(src) temp = "" else if(href_list["disconnectcall"]) var/datum/holocall/call_to_disconnect = locateUID(href_list["disconnectcall"]) - if(!qdeleted(call_to_disconnect)) + if(exists(call_to_disconnect) && (call_to_disconnect in holo_calls)) call_to_disconnect.Disconnect(src) temp = ""