pda refactor

This commit is contained in:
Tastyfish
2016-02-12 03:21:54 -05:00
parent 14f190dad1
commit a8f9ea2086
48 changed files with 2797 additions and 2491 deletions
+6 -4
View File
@@ -27,16 +27,18 @@
if(useMS)
if(prob(5))
// /obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "")
var/obj/item/device/pda/P
var/list/viables = list()
for(var/obj/item/device/pda/check_pda in PDAs)
if (!check_pda.owner||check_pda.toff||check_pda == src||check_pda.hidden)
var/datum/data/pda/app/messenger/check_m = check_pda.find_program(/datum/data/pda/app/messenger)
if (!check_m || !check_m.can_receive())
continue
viables.Add(check_pda)
if(!viables.len)
return
P = pick(viables)
var/obj/item/device/pda/P = pick(viables)
var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger)
var/sender
var/message
@@ -104,7 +106,7 @@
//Commented out because we don't send messages like this anymore. Instead it will just popup in their chat window.
//P.tnote += "<i><b>&larr; From [sender] (Unknown / spam?):</b></i><br>[message]<br>"
P.play_ringtone()
PM.play_ringtone()
//Search for holder of the PDA.
var/mob/living/L = null
if(P.loc && isliving(P.loc))
+2 -1
View File
@@ -108,7 +108,8 @@
pda.ownjob = "Personal Assistant"
pda.owner = text("[]", src)
pda.name = pda.owner + " (" + pda.ownjob + ")"
pda.toff = 1
var/datum/data/pda/app/messenger/M = pda.find_program(/datum/data/pda/app/messenger)
M.toff = 1
..()
/mob/living/silicon/pai/Login()
@@ -142,15 +142,24 @@
on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
var/data[0]
data["receiver_off"] = user.pda.toff
data["ringer_off"] = user.pda.silent
if(!user.pda)
return
var/datum/data/pda/app/messenger/M = user.pda.find_program(/datum/data/pda/app/messenger)
if(!M)
return
data["receiver_off"] = M.toff
data["ringer_off"] = M.silent
data["current_ref"] = null
data["current_name"] = user.current_pda_messaging
var/pdas[0]
if(!user.pda.toff)
if(!M.toff)
for(var/obj/item/device/pda/P in PDAs)
if(!P.owner || P.toff || P == user.pda || P.hidden) continue
var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger)
if(P == user.pda || !PM || !PM.can_receive())
continue
var/pda[0]
pda["name"] = "[P]"
pda["owner"] = "[P.owner]"
@@ -163,7 +172,7 @@
var/messages[0]
if(user.current_pda_messaging)
for(var/index in user.pda.tnote)
for(var/index in M.tnote)
if(index["owner"] != user.current_pda_messaging)
continue
var/msg[0]
@@ -188,11 +197,15 @@
if(!istype(P)) return
if(!isnull(P.pda))
var/datum/data/pda/app/messenger/M = P.pda.find_program(/datum/data/pda/app/messenger)
if(!M)
return
if(href_list["toggler"])
P.pda.toff = href_list["toggler"] != "1"
M.toff = href_list["toggler"] != "1"
return 1
else if(href_list["ringer"])
P.pda.silent = href_list["ringer"] != "1"
M.silent = href_list["ringer"] != "1"
return 1
else if(href_list["select"])
var/s = href_list["select"]
@@ -206,7 +219,7 @@
return alert("Communications circuits remain uninitialized.")
var/target = locate(href_list["target"])
P.pda.create_message(P, target, 1)
M.create_message(P, target, 1)
return 1
/datum/pai_software/med_records
@@ -174,7 +174,9 @@ var/list/robot_verbs_default = list(
rbPDA = new/obj/item/device/pda/ai(src)
rbPDA.set_name_and_job(custom_name,braintype)
if(scrambledcodes)
rbPDA.hidden = 1
var/datum/data/pda/app/messenger/M = rbPDA.find_program(/datum/data/pda/app/messenger)
if(M)
M.hidden = 1
/mob/living/silicon/robot/binarycheck()
if(is_component_functioning("comms"))
+2 -2
View File
@@ -231,8 +231,8 @@
if(L)
L << "\icon[P] <b>Message from unknown source: </b>\"[t]\" (Unable to Reply)"
P.play_ringtone()
P.overlays.Cut()
P.overlays += image('icons/obj/pda.dmi', "pda-r")
var/datum/data/pda/app/messenger/M = P.find_program(/datum/data/pda/app/messenger)
M.set_new(1)
if("Inject")
if( (href_list["tag"]=="radium"? (reagents.get_reagent_amount("radium"))<=(a_boost*a_transfer) : !reagents.get_reagent_amount(href_list["tag"])) )//Special case for radium. If there are only a_boost*a_transfer radium units left.