[deathMessage]
"//records a message in their PDA as being sent to the grim reaper - return BRUTELOSS - -/obj/item/pda/examine(mob/user) - . = ..() - if(!id && !inserted_item) - return - - if(id) - . += span_notice("Alt-click to remove the id.") - - if(inserted_item && (!isturf(loc))) - . += span_notice("Ctrl-click to remove [inserted_item].") - -/obj/item/pda/Initialize(mapload) - . = ..() - - GLOB.PDAs += src - if(default_cartridge) - cartridge = SSwardrobe.provide_type(default_cartridge, src) - cartridge.host_pda = src - if(insert_type) - inserted_item = SSwardrobe.provide_type(insert_type, src) - update_appearance(UPDATE_ICON) - -/obj/item/pda/Destroy() - GLOB.PDAs -= src - if(istype(id)) - QDEL_NULL(id) - if(istype(cartridge)) - QDEL_NULL(cartridge) - if(istype(pai)) - QDEL_NULL(pai) - if(istype(inserted_item)) - QDEL_NULL(inserted_item) - return ..() - -/obj/item/pda/equipped(mob/user, slot) - . = ..() - if(!equipped) - if(user.client) - background_color = user.client.prefs.read_preference(/datum/preference/color/pda_color) - switch(user.client.prefs.read_preference(/datum/preference/choiced/pda_style)) - if(PDA_FONT_MONO) - font_index = MODE_MONO - font_mode = FONT_MONO - if(PDA_FONT_SHARE) - font_index = MODE_SHARE - font_mode = FONT_SHARE - if(PDA_FONT_ORBITRON) - font_index = MODE_ORBITRON - font_mode = FONT_ORBITRON - if(PDA_FONT_VT) - font_index = MODE_VT - font_mode = FONT_VT - else - font_index = MODE_MONO - font_mode = FONT_MONO - equipped = TRUE - -/obj/item/pda/Exited(atom/movable/gone, direction) - . = ..() - if(gone == cartridge) - cartridge.host_pda = null - cartridge = null - if(gone == inserted_item) - inserted_item = null - -/obj/item/pda/proc/update_label() - name = "\improper antique PDA-[owner] ([ownjob])" //Name generalisation - -/obj/item/pda/GetAccess() - if(id) - return id.GetAccess() - else - return ..() - -/obj/item/pda/GetID() - return id - -/obj/item/pda/RemoveID() - return do_remove_id() - -/obj/item/pda/InsertID(obj/item/inserting_item) - var/obj/item/card/inserting_id = inserting_item.RemoveID() - if(!inserting_id) - return - insert_id(inserting_id) - if(id == inserting_id) - return TRUE - return FALSE - -/obj/item/pda/update_overlays() - . = ..() - var/mutable_appearance/overlay = new() - overlay.pixel_x = overlays_x_offset - if(id) - overlay.icon_state = "id_overlay" - . += new /mutable_appearance(overlay) - if(inserted_item) - overlay.icon_state = "insert_overlay" - . += new /mutable_appearance(overlay) - if(light_on) - overlay.icon_state = "light_overlay" - . += new /mutable_appearance(overlay) - if(pai) - if(pai.pai) - overlay.icon_state = "pai_overlay" - . += new /mutable_appearance(overlay) - else - overlay.icon_state = "pai_off_overlay" - . += new /mutable_appearance(overlay) - -/obj/item/pda/MouseDrop(mob/over, src_location, over_location) - var/mob/M = usr - if((M == over) && usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) - return attack_self(M) - return ..() - -/obj/item/pda/attack_self_tk(mob/user) - to_chat(user, span_warning("The PDA's capacitive touch screen doesn't seem to respond!")) - return - -/obj/item/pda/interact(mob/user) - if(!user.IsAdvancedToolUser()) - to_chat(user, span_warning("You don't have the dexterity to do this!")) - return - - ..() - - var/datum/asset/spritesheet/assets = get_asset_datum(/datum/asset/spritesheet/simple/pda) - assets.send(user) - - user.set_machine(src) - - var/dat = "
"
- dat += "
Toggle Font" - dat += " | Change Color" - dat += " | Toggle Underline" //underline button - - dat += "
"
-
- dat += "Toggle Font" - dat += " | Change Color" - dat += " | Toggle Underline" //underline button - - dat += "
" - - if (!owner) - dat += "Warning: No owner information entered. Please swipe card.
" - dat += "[PDAIMG(refresh)]Retry" - else - switch (mode) - if (0) - dat += "
PERSONAL DATA ASSISTANT v.1.3
" - dat += "Owner: [owner], [ownjob]" - dat += text("ID: [id ? "[id.registered_name], [id.assignment]" : "----------"]") - dat += text("
[id ? "Update PDA Info" : ""]
") - - dat += "[station_time_timestamp()]
" //:[world.time / 100 % 6][world.time / 100 % 10]" - dat += "[time2text(world.realtime, "MMM DD")] [GLOB.year_integer+540]" - - dat += "
" - - dat += "
General Functions
" - dat += "- "
- dat += "
- [PDAIMG(notes)]Notekeeper " - dat += "
- [PDAIMG(mail)]Messenger " - if (cartridge) - if (cartridge.access & CART_CLOWN) - dat += "
- [PDAIMG(honk)]Honk Synthesizer " - dat += "
- [PDAIMG(honk)]Sad Trombone " - if (cartridge.access & CART_MANIFEST) - dat += "
- [PDAIMG(notes)]View Crew Manifest " - if(cartridge.access & CART_STATUS_DISPLAY) - dat += "
- [PDAIMG(status)]Set Status Display " - dat += "
Engineering Functions
" - dat += "- "
- dat += "
- [PDAIMG(power)]Power Monitor " - dat += "
Medical Functions
" - dat += "- "
- dat += "
- [PDAIMG(medical)]Medical Records " - dat += "
- [PDAIMG(scanner)][scanmode == 1 ? "Disable" : "Enable"] Medical Scanner " - dat += "
Security Functions
" - dat += "- "
- dat += "
- [PDAIMG(cuffs)]Security Records " - dat += "
Quartermaster Functions:
" - dat += "- "
- dat += "
- [PDAIMG(crate)]Supply Records " - dat += "
- [PDAIMG(crate)]Ore Silo Logs " - dat += "
Utilities
" - dat += "- "
-
- if (cartridge)
- if(ownjob != "Assistant")
- dat += "
- [PDAIMG(dronephone)]Assistant Pager " - if(cartridge.bot_access_flags) - dat += "
- [PDAIMG(medbot)]Bots Access " - if (cartridge.access & CART_JANITOR) - dat += "
- [PDAIMG(bucket)]Custodial Locator " - if (istype(cartridge.radio)) - dat += "
- [PDAIMG(signaler)]Signaler System " - if (cartridge.access & CART_NEWSCASTER) - dat += "
- [PDAIMG(notes)]Newscaster Access " - if (cartridge.access & CART_REAGENT_SCANNER) - dat += "
- [PDAIMG(reagent)][scanmode == 3 ? "Disable" : "Enable"] Reagent Scanner " - if (cartridge.access & CART_ENGINE) - dat += "
- [PDAIMG(reagent)][scanmode == 4 ? "Disable" : "Enable"] Halogen Counter " - if (cartridge.access & CART_ATMOS) - dat += "
- [PDAIMG(reagent)][scanmode == 5 ? "Disable" : "Enable"] Gas Scanner " - if (cartridge.access & CART_REMOTE_DOOR) - dat += "
- [PDAIMG(rdoor)]Toggle Remote Door " - if (cartridge.access & CART_DRONEPHONE) - dat += "
- [PDAIMG(dronephone)]Drone Phone " - if (cartridge.access & CART_STATUS_DISPLAY) - dat += "
- [PDAIMG(blank)]Bluespace Paperwork Printer " - else if (cartridge.access & CART_SECURITY) - dat += "
- [PDAIMG(notes)]Print Security Incident Report Form " - dat += "
- [PDAIMG(notes)]Print Incident Report Form " - if(id && id.registered_account && id.registered_account.account_job.paycheck_department) - dat += "
- [PDAIMG(notes)]Show Department Goals " - dat += "
- [PDAIMG(atmos)]Atmospheric Scan " - dat += "
- [PDAIMG(flashlight)][light_on ? "Disable" : "Enable"] Flashlight " - if (pai) - if(pai.loc != src) - pai = null - update_appearance(UPDATE_ICON) - else - dat += "
- pAI Device Configuration " - dat += "
- Eject pAI Device " - dat += "
[PDAIMG(notes)] Notekeeper V2.2
" - dat += "Edit" - if(notescanned) - dat += "(This is a scanned image, editing it may cause some text formatting to change.)
" - dat += "
[(!notehtml ? note : notehtml)]" - - if (2) - dat += "
[PDAIMG(mail)] SpaceMessenger V3.9.6
" - dat += "[PDAIMG(bell)]Ringer: [silent == 1 ? "Off" : "On"] | " - dat += "[PDAIMG(mail)]Send / Receive: [toff == 1 ? "Off" : "On"] | " - dat += "[PDAIMG(bell)]Set Ringtone | " - dat += "[PDAIMG(mail)]Messages" - - if(cartridge) - dat += cartridge.message_header() - - dat += "
[PDAIMG(menu)] Detected PDAs
" - - dat += "- "
- var/count = 0
-
- if (!toff)
- for (var/obj/item/pda/P in sortNames(get_viewable_pdas()))
- if (P == src)
- continue
- dat += "
- [P]" - if(cartridge) - dat += cartridge.message_special(P) - dat += " " - count++ - dat += "
" - else if(cartridge && cartridge.spam_enabled) - dat += "Send To All" - - if(21) - dat += "
[PDAIMG(mail)] SpaceMessenger V3.9.6
" - dat += "[PDAIMG(blank)]Clear Messages" - - dat += "[PDAIMG(mail)] Messages
" - - //Build the message list - for(var/x in tnote) - if(istext(x)) // If it's literally just text - dat += tnote - else // It's hopefully a signal - var/datum/signal/subspace/messaging/pda/sig = x - dat += "[sig.data["name"]] ([sig.data["job"]]):[sig.format_message(user)]
" - dat += "
" - - if (3) - dat += "
[PDAIMG(atmos)] Atmospheric Readings
" - - if (!isopenturf(get_turf(user))) - dat += "Unable to obtain a reading." - else - var/datum/gas_mixture/environment = user.return_air() - - var/pressure = environment?.return_pressure() - var/total_moles = environment?.total_moles() - - dat += "Air Pressure: [round(pressure,0.1)] kPa
" - - if (total_moles) - for(var/id in environment.get_gases()) - var/gas_level = environment.get_moles(id)/total_moles - if(gas_level > 0) - dat += "[GLOB.gas_data.names[id]]: [round(gas_level*100, 0.01)]%
" - - dat += "Temperature: [round(environment.return_temperature()-T0C)]°C
" - dat += "
" - - if (5) - dat += "
Bluespace Paperwork Printing
Putting the paper in paperwork!- "
- dat += "
- General Request Form " - dat += "
- Complaint Form " - dat += "
- Incident Report Form " - dat += "
- Security Incident Report Form " - dat += "
- Item Request Form " - dat += "
- Cyberization Consent Form " - dat += "
- HoP Access Request Form " - dat += "
- Job Change Request Form " - dat += "
- Research Request Form " - dat += "
- Mech Request Form " - dat += "
- Job Reassignment Certificate " - dat += "
- Literacy Test " - dat += "
- Literacy Test Answers " - dat += "
Department Goals for the [SSYogs.getDepartmentFromAccount(dep_account)] department:
- "
- for(var/datum/department_goal/dg in SSYogs.department_goals)
- if(dg.account == dep_account)
- dat += "
- [dg.name]: " - dat += "
- [dg.desc]
" - dat += "
", "\[br\]") - note = replacetext(note, "
- ", "\[list\]")
- note = replacetext(note, "
[sig.format_message(user)]
" - dat += "
" - var/HTML = "
[sig.format_message(user)]
" - dat += "
" - var/HTML = "
[PDAIMG(signaler)] Remote Signaling System
" - - menu += {" -Send Signal-Frequency: -- -- -[format_frequency(radio.frequency)] -+ -+
-
-Code: -- -- -[radio.code] -+ -+
"} - if (41) //crew manifest - - menu = "
[PDAIMG(notes)] Crew Manifest
" - menu += "Entries cannot be modified from this terminal." - if(GLOB.data_core.general) - for (var/datum/data/record/t in sortRecord(GLOB.data_core.general)) - menu += "[t.fields["name"]] - [t.fields["rank"]]
" - menu += "
" - - - if (42) //status displays - menu = "
[PDAIMG(status)] Station Status Display Interlink
" - - menu += "\[ Clear \]" - menu += "\[ Shuttle ETA \]
" - menu += "\[ Message \]" - menu += "
- Line 1: [ message1 ? message1 : "(none)"]" - menu += "
- Line 2: [ message2 ? message2 : "(none)"]
" - menu += "\[ Alert: None |" - menu += " Red Alert |" - menu += " Lockdown |" - menu += " Biohazard \]
" - - if (43) - menu = "
[PDAIMG(power)] Power Monitors - Please select one
" - powmonitor = null - powermonitors = list() - var/powercount = 0 - - - - var/turf/pda_turf = get_turf(src) - for(var/obj/machinery/computer/monitor/pMon in GLOB.machines) - if(pMon.stat & (NOPOWER | BROKEN)) //check to make sure the computer is functional - continue - if(pda_turf.z != pMon.z) //and that we're on the same zlevel as the computer (lore: limited signal strength) - continue - if(pMon.is_secret_monitor) //make sure it isn't a secret one (ie located on a ruin), allowing people to metagame that the location exists - continue - powercount++ - powermonitors += pMon - - - if(!powercount) - menu += span_danger("No connection
") - else - - menu += "" - var/count = 0 - for(var/obj/machinery/computer/monitor/pMon in powermonitors) - count++ - menu += "[pMon] - [get_area_name(pMon, TRUE)]
" - - menu += "" - - if (433) - menu = "
[PDAIMG(power)] Power Monitor
" - if(!powmonitor || !powmonitor.get_powernet()) - menu += span_danger("No connection
") - else - var/list/L = list() - var/datum/powernet/connected_powernet = powmonitor.get_powernet() - for(var/obj/machinery/power/terminal/term in connected_powernet.nodes) - if(istype(term.master, /obj/machinery/power/apc)) - var/obj/machinery/power/apc/A = term.master - L += A - - menu += "
Location: [get_area_name(powmonitor, TRUE)]" - - if (44) //medical records //This thing only displays a single screen so it's hard to really get the sub-menu stuff working. - menu = "
Total power: [DisplayPower(connected_powernet.viewavail)]
Total load: [DisplayPower(connected_powernet.viewload)]
" - - menu += "" - - if(L.len > 0) - menu += "Area Eqp./Lgt./Env. Load Cell
" - - var/list/S = list(" Off","AOff"," On", " AOn") - var/list/chg = list("N","C","F") - - for(var/obj/machinery/power/apc/A in L) - menu += copytext_char(add_trailing(A.area.name, 30, " "), 1, 30) - menu += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_leading(DisplayPower(A.lastused_total), 6, " ")] [A.cell ? "[add_leading(round(A.cell.percent()), 3, " ")]% [chg[A.charging+1]]" : " N/C"]
" - - menu += "
[PDAIMG(medical)] Medical Record List
" - if(GLOB.data_core.general) - for(var/datum/data/record/R in sortRecord(GLOB.data_core.general)) - menu += "[R.fields["id"]]: [R.fields["name"]]" - menu += "
" - if(441) - menu = "
[PDAIMG(medical)] Medical Record
" - - if(active1 in GLOB.data_core.general) - menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]" - menu += "Gender: [active1.fields["gender"]]
" - menu += "Age: [active1.fields["age"]]
" - menu += "Rank: [active1.fields["rank"]]
" - menu += "Fingerprint: [active1.fields["fingerprint"]]
" - menu += "Physical Status: [active1.fields["p_stat"]]
" - menu += "Mental Status: [active1.fields["m_stat"]]
" - else - menu += "Record Lost!
" - - menu += "
" - - menu += "
[PDAIMG(medical)] Medical Data
" - if(active2 in GLOB.data_core.medical) - menu += "Blood Type: [active2.fields["blood_type"]]" - - menu += "Minor Disabilities: [active2.fields["mi_dis"]]
" - menu += "Details: [active2.fields["mi_dis_d"]]
" - - menu += "Major Disabilities: [active2.fields["ma_dis"]]
" - menu += "Details: [active2.fields["ma_dis_d"]]
" - - menu += "Allergies: [active2.fields["alg"]]
" - menu += "Details: [active2.fields["alg_d"]]
" - - menu += "Current Diseases: [active2.fields["cdi"]]
" - menu += "Details: [active2.fields["cdi_d"]]
" - - menu += "Important Notes: [active2.fields["notes"]]
" - else - menu += "Record Lost!
" - - menu += "
" - if (45) //security records - menu = "
[PDAIMG(cuffs)] Security Record List
" - if(GLOB.data_core.general) - for (var/datum/data/record/R in sortRecord(GLOB.data_core.general)) - menu += "[R.fields["id"]]: [R.fields["name"]]" - - menu += "
" - if(451) - menu = "
[PDAIMG(cuffs)] Security Record
" - - if(active1 in GLOB.data_core.general) - menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]" - menu += "Gender: [active1.fields["gender"]]
" - menu += "Age: [active1.fields["age"]]
" - menu += "Rank: [active1.fields["rank"]]
" - menu += "Fingerprint: [active1.fields["fingerprint"]]
" - menu += "Physical Status: [active1.fields["p_stat"]]
" - menu += "Mental Status: [active1.fields["m_stat"]]
" - else - menu += "Record Lost!
" - - menu += "
" - - menu += "
[PDAIMG(cuffs)] Security Data
" - if(active3 in GLOB.data_core.security) - menu += "Criminal Status: [active3.fields["criminal"]]" - - menu += text("
\nCrimes:") - - menu +={"
| Crime | -Details | -Author | -Time Added | -
|---|---|---|---|
| [c.crimeName] | " - menu += "[c.crimeDetails] | " - menu += "[c.author] | " - menu += "[c.time] | " - menu += "
\nComments:") - - menu +={"
| Comment | -Author | -Time Added | -
|---|---|---|
| [c.commentText] | " - menu += "[c.author] | " - menu += "[c.time] | " - menu += "
\nImportant Notes:
" - menu += "[active3.fields["notes"]]" - else - menu += "Record Lost!
" - - menu += "
" - - if (47) //quartermaster order records - menu = "
[PDAIMG(crate)] Supply Record Interlink
" - - menu += "Supply shuttle
" - menu += "Location: " - switch(SSshuttle.supply.mode) - if(SHUTTLE_CALL) - menu += "Moving to " - if(!is_station_level(SSshuttle.supply.z)) - menu += "station" - else - menu += "CentCom" - menu += " ([SSshuttle.supply.timeLeft(600)] Mins)" - else - menu += "At " - if(!is_station_level(SSshuttle.supply.z)) - menu += "CentCom" - else - menu += "station" - menu += "
Current approved orders:
- "
- for(var/S in SSshuttle.shopping_list)
- var/datum/supply_order/SO = S
- menu += "
- #[SO.id] - [SO.pack.name] approved by [SO.orderer] [SO.reason ? "([SO.reason])":""] " - menu += "
- "
- for(var/S in SSshuttle.request_list)
- var/datum/supply_order/SO = S
- menu += "
- #[SO.id] - [SO.pack.name] requested by [SO.orderer] " - menu += "
[PDAIMG(crate)] Ore Silo Logs
") - if (GLOB.ore_silo_default) - var/list/logs = GLOB.silo_access_logs[REF(GLOB.ore_silo_default)] - var/len = LAZYLEN(logs) - var/i = 0 - for(var/M in logs) - if (++i > 30) - menu += "(... older logs not shown ...)" - break - var/datum/ore_silo_log/entry = M - menu += "[len - i]. [entry.formatted]" - if(i == 0) - menu += "Nothing!" - else - menu += "No ore silo detected!" - menu = jointext(menu, "") - - if (49) //janitorial locator - menu = "
[PDAIMG(bucket)] Persistent Custodial Object Locator
" - - var/turf/cl = get_turf(src) - if (cl) - menu += "Current Orbital Location: \[[cl.x],[cl.y]\]" - - menu += "Located Mops:
" - - var/ldat - for (var/obj/item/mop/M in world) - var/turf/ml = get_turf(M) - - if(ml) - if (ml.z != cl.z) - continue - var/direction = get_dir(src, M) - ldat += "Mop - \[[ml.x],[ml.y] ([uppertext(dir2text(direction))])\] - [M.reagents.total_volume ? "Wet" : "Dry"]" - - if (!ldat) - menu += "None" - else - menu += "[ldat]" - - menu += "
Located Janitorial Cart:
" - - ldat = null - for (var/obj/structure/janitorialcart/B in world) - var/turf/bl = get_turf(B) - - if(bl) - if (bl.z != cl.z) - continue - var/direction = get_dir(src, B) - ldat += "Cart - \[[bl.x],[bl.y] ([uppertext(dir2text(direction))])\] - Water level: [B.reagents.total_volume]/100" - - if (!ldat) - menu += "None" - else - menu += "[ldat]" - - menu += "
Located Cleanbots:
" - - ldat = null - for (var/mob/living/simple_animal/bot/cleanbot/B in GLOB.alive_mob_list) - var/turf/bl = get_turf(B) - - if(bl) - if (bl.z != cl.z) - continue - var/direction = get_dir(src, B) - ldat += "Cleanbot - \[[bl.x],[bl.y] ([uppertext(dir2text(direction))])\] - [B.on ? "Online" : "Offline"]" - - if (!ldat) - menu += "None" - else - menu += "[ldat]" - - else - menu += "ERROR: Unable to determine current location." - menu += "
Refresh GPS Locator" - - if (53) // Newscaster - menu = "
[PDAIMG(notes)] Newscaster Access
" - menu += "Current Newsfeed: [current_channel ? current_channel : "None"]
" - var/datum/newscaster/feed_channel/current - for(var/datum/newscaster/feed_channel/chan in GLOB.news_network.network_channels) - if (chan.channel_name == current_channel) - current = chan - if(!current) - menu += "
ERROR : NO CHANNEL FOUND
" - return menu - var/i = 1 - for(var/datum/newscaster/feed_message/msg in current.messages) - menu +="-[msg.returnBody(-1)]\[Story by [msg.returnAuthor(-1)]\]
" - menu +="[msg.comments.len] comment[msg.comments.len > 1 ? "s" : ""]
" - if(msg.img) - user << browse_rsc(msg.img, "tmp_photo[i].png") - menu +="
" - i++ - for(var/datum/newscaster/feed_comment/comment in msg.comments) - menu +="[comment.body]
[comment.author] [comment.time_stamp]
" - menu += "
Post Message" - - if (54) // Beepsky, Medibot, Floorbot, and Cleanbot access - menu = "
[PDAIMG(medbot)] Bots Interlink
" - bot_control() - if (99) //Newscaster message permission error - menu = "ERROR : NOT AUTHORIZED [host_pda.id ? "" : "- ID SLOT EMPTY"]
" - - return menu - -/obj/item/cartridge/Topic(href, href_list) - ..() - - if(!usr.canUseTopic(src, !issilicon(usr))) - usr.unset_machine() - usr << browse(null, "window=pda") - return - - switch(href_list["choice"]) - if("Medical Records") - active1 = find_record("id", href_list["target"], GLOB.data_core.general) - if(active1) - active2 = find_record("id", href_list["target"], GLOB.data_core.medical) - host_pda.mode = 441 - if(!active2) - active1 = null - - if("Security Records") - active1 = find_record("id", href_list["target"], GLOB.data_core.general) - if(active1) - active3 = find_record("id", href_list["target"], GLOB.data_core.security) - host_pda.mode = 451 - if(!active3) - active1 = null - - if("Send Signal") - INVOKE_ASYNC(radio, TYPE_PROC_REF(/obj/item/integrated_signaler, send_activation)) - - if("Signal Frequency") - var/new_frequency = sanitize_frequency(radio.frequency + text2num(href_list["sfreq"])) - radio.set_frequency(new_frequency) - - if("Signal Code") - radio.code += text2num(href_list["scode"]) - radio.code = round(radio.code) - radio.code = min(100, radio.code) - radio.code = max(1, radio.code) - - if("Status") - switch(href_list["statdisp"]) - if("message") - post_status("message", message1, message2) - message_admins("[ADMIN_LOOKUPFLW(usr)] set the status lines to: [message1] - [message2].") - if("alert") - post_status("alert", href_list["alert"]) - if("setmsg1") - message1 = reject_bad_text(input("Line 1", "Enter Message Text", message1) as text|null, 40) - updateSelfDialog() - if("setmsg2") - message2 = reject_bad_text(input("Line 2", "Enter Message Text", message2) as text|null, 40) - updateSelfDialog() - else - post_status(href_list["statdisp"]) - if("Power Select") - var/pnum = text2num(href_list["target"]) - powmonitor = powermonitors[pnum] - host_pda.mode = 433 - - if("Supply Orders") - host_pda.mode =47 - - if("Newscaster Access") - host_pda.mode = 53 - - if("Newscaster Message") - var/host_pda_owner_name = host_pda.id ? "[host_pda.id.registered_name] ([host_pda.id.assignment])" : "Unknown" - var/message = host_pda.msg_input() - var/datum/newscaster/feed_channel/current - for(var/datum/newscaster/feed_channel/chan in GLOB.news_network.network_channels) - if (chan.channel_name == current_channel) - current = chan - if(current.locked && current.author != host_pda_owner_name) - host_pda.mode = 99 - host_pda.Topic(null,list("choice"="Refresh")) - return - GLOB.news_network.SubmitArticle(message,host_pda.owner,current_channel) - host_pda.Topic(null,list("choice"=num2text(host_pda.mode))) - return - - if("Newscaster Switch Channel") - current_channel = host_pda.msg_input() - host_pda.Topic(null,list("choice"=num2text(host_pda.mode))) - return - - //Bot control section! Viciously ripped from radios for being laggy and terrible. - if(href_list["op"]) - switch(href_list["op"]) - - if("control") - active_bot = locate(href_list["bot"]) in GLOB.bots_list - - if("botlist") - active_bot = null - if("summon") //Args are in the correct order, they are stated here just as an easy reminder. - active_bot.bot_control("summon", usr, host_pda.GetAccess()) - else //Forward all other bot commands to the bot itself! - active_bot.bot_control(href_list["op"], usr) - - if(href_list["mule"]) //MULEbots are special snowflakes, and need different args due to how they work. - var/mob/living/simple_animal/bot/mulebot/mule = active_bot - if (istype(mule)) - mule.bot_control(href_list["mule"], usr, pda=TRUE) - - if(!host_pda) - return - host_pda.attack_self(usr) - - -/obj/item/cartridge/proc/bot_control() - if(active_bot) - menu += "[active_bot]Status: ([PDAIMG(refresh)]refresh)
" - menu += "Model: [active_bot.model]
" - menu += "Location: [get_area(active_bot)]
" - menu += "Mode: [active_bot.get_mode()]" - if(active_bot.allow_pai) - menu += "
pAI: " - if(active_bot.paicard && active_bot.paicard.pai) - menu += "[active_bot.paicard.pai.name]" - if(active_bot.bot_core.allowed(usr)) - menu += " (eject)" - else - menu += "none" - - //MULEs! - if(active_bot.bot_type == MULE_BOT) - var/mob/living/simple_animal/bot/mulebot/MULE = active_bot - var/atom/Load = MULE.load - menu += "
Current Load: [ !Load ? "none" : "[Load.name] (unload)" ]
" - menu += "Destination: [MULE.destination ? MULE.destination : "None"] (set)
" - menu += "Set ID: [MULE.suffix] Modify
" - menu += "Power: [MULE.cell ? MULE.cell.percent() : 0]%
" - menu += "Home: [!MULE.home_destination ? "none" : MULE.home_destination ]
" - menu += "Delivery Reporting: [MULE.report_delivery ? "(On)": "(Off)"]
" - menu += "Auto Return Home: [MULE.auto_return ? "(On)": "(Off)"]
" - menu += "Auto Pickup Crate: [MULE.auto_pickup ? "(On)": "(Off)"]
" //Hue. - - menu += "\[Stop\] " - menu += "\[Proceed\] " - menu += "\[Return Home\]
" - - else - menu += "
\[Stop Patrol\] " //patrolon - menu += "\[Start Patrol\] " //patroloff - menu += "\[Summon Bot\]
" //summon - menu += "Keep an ID inserted to upload access codes upon summoning." - - menu += "
[PDAIMG(back)]Return to bot list" - else - menu += "
[PDAIMG(refresh)]Scan for active bots
" - var/turf/current_turf = get_turf(src) - var/zlevel = current_turf.z - var/botcount = 0 - for(var/B in GLOB.bots_list) //Git da botz - var/mob/living/simple_animal/bot/Bot = B - if(!Bot.on || Bot.z != zlevel || Bot.remote_disabled || !(bot_access_flags & Bot.bot_type)) //Only non-emagged bots on the same Z-level are detected! - continue //Also, the PDA must have access to the bot type. - menu += "[Bot.name] ([Bot.get_mode()])
" - botcount++ - if(!botcount) //No bots at all? Lame. - menu += "No bots found.
" - return - - return menu - -//If the cartridge adds a special line to the top of the messaging app -/obj/item/cartridge/proc/message_header() - return "" - -//If the cartridge adds something to each potetial messaging target -/obj/item/cartridge/proc/message_special(obj/item/pda/target) - return "" - -//This is called for special abilities of cartridges -/obj/item/cartridge/proc/special(mob/living/user, list/params) diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm deleted file mode 100644 index 39d1a7b5223f..000000000000 --- a/code/game/objects/items/devices/PDA/radio.dm +++ /dev/null @@ -1,38 +0,0 @@ -// Radio Cartridge, essentially a remote signaler with limited spectrum. -/obj/item/integrated_signaler - name = "\improper PDA radio module" - desc = "An electronic radio system of Nanotrasen origin." - icon = 'icons/obj/module.dmi' - icon_state = "power_mod" - -/obj/item/integrated_signaler - var/frequency = FREQ_SIGNALER - var/code = DEFAULT_SIGNALER_CODE - var/last_transmission - var/datum/radio_frequency/radio_connection - -/obj/item/integrated_signaler/Destroy() - radio_connection = null - return ..() - -/obj/item/integrated_signaler/Initialize(mapload) - . = ..() - if (frequency < MIN_FREE_FREQ || frequency > MAX_FREE_FREQ) - frequency = sanitize_frequency(frequency) - set_frequency(frequency) - -/obj/item/integrated_signaler/proc/set_frequency(new_frequency) - frequency = new_frequency - radio_connection = SSradio.return_frequency(frequency) - -/obj/item/integrated_signaler/proc/send_activation() - if(last_transmission && world.time < (last_transmission + 5)) - return - last_transmission = world.time - - var/time = time2text(world.realtime,"hh:mm:ss") - var/turf/T = get_turf(src) - GLOB.lastsignalers.Add("[time] : [usr.key] used [src] @ location [AREACOORD(T)] : [format_frequency(frequency)]/[code]") - - var/datum/signal/signal = new(list("code" = code)) - radio_connection.post_signal(src, signal, filter = RADIO_SIGNALER) diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm deleted file mode 100644 index e2834cba7e77..000000000000 --- a/code/game/objects/items/devices/PDA/virus_cart.dm +++ /dev/null @@ -1,106 +0,0 @@ -/obj/item/cartridge/virus - name = "Generic Virus PDA cart" - var/charges = 5 - -/obj/item/cartridge/virus/proc/send_virus(obj/item/pda/target, mob/living/U) - return - -/obj/item/cartridge/virus/message_header() - return "[charges] viral files left.
" - -/obj/item/cartridge/virus/message_special(obj/item/pda/target) - if (!istype(loc, /obj/item/pda)) - return "" //Sanity check, this shouldn't be possible. - return " (*Send Virus*)" - -/obj/item/cartridge/virus/special(mob/living/user, list/params) - var/obj/item/pda/P = locate(params["target"]) in GLOB.PDAs //Leaving it alone in case it may do something useful, I guess. - send_virus(P,user) - -/obj/item/cartridge/virus/clown - name = "\improper Honkworks 5.0 cartridge" - icon_state = "cart-clown" - desc = "A data cartridge for portable microcomputers. It smells vaguely of bananas." - access = CART_CLOWN - -/obj/item/cartridge/virus/clown/send_virus(obj/item/pda/target, mob/living/U) - if(charges <= 0) - to_chat(U, span_notice("Out of charges.")) - return - if(!isnull(target) && !target.toff) - charges-- - to_chat(U, span_notice("Virus Sent!")) - target.honkamt = (rand(15,20)) - else - to_chat(U, "PDA not found.") - -/obj/item/cartridge/virus/mime - name = "\improper Gestur-O 1000 cartridge" - icon_state = "cart-mi" - access = CART_MIME - -/obj/item/cartridge/virus/mime/send_virus(obj/item/pda/target, mob/living/U) - if(charges <= 0) - to_chat(U, span_notice("Out of charges.")) - return - if(!isnull(target) && !target.toff) - charges-- - to_chat(U, span_notice("Virus Sent!")) - target.silent = TRUE - target.ttone = "silence" - else - to_chat(U, "PDA not found.") - -/obj/item/cartridge/virus/syndicate - name = "\improper Detomatix cartridge" - icon_state = "cart" - access = CART_REMOTE_DOOR - remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing. - charges = 4 - -/obj/item/cartridge/virus/syndicate/send_virus(obj/item/pda/target, mob/living/U) - if(charges <= 0) - to_chat(U, span_notice("Out of charges.")) - return - if(!isnull(target) && !target.toff) - charges-- - var/difficulty = 0 - if(target.cartridge) - difficulty += BitCount(target.cartridge.access&(CART_MEDICAL | CART_SECURITY | CART_ENGINE | CART_CLOWN | CART_JANITOR | CART_MANIFEST)) - if(target.cartridge.access & CART_MANIFEST) - difficulty++ //if cartridge has manifest access it has extra snowflake difficulty - else - difficulty += 2 - if(SEND_SIGNAL(target, COMSIG_TABLET_CHECK_DETONATE) & COMPONENT_TABLET_NO_DETONATE || prob(difficulty * 15)) - U.show_message(span_danger("An error flashes on your [src]."), MSG_VISUAL) - else - log_bomber(U, "triggered a PDA explosion on", target, "[!is_special_character(U) ? "(TRIGGED BY NON-ANTAG)" : ""]") - U.show_message(span_notice("Success!"), MSG_VISUAL) - target.explode() - else - to_chat(U, "PDA not found.") - -/obj/item/cartridge/virus/frame - name = "\improper F.R.A.M.E. cartridge" - icon_state = "cart" - var/telecrystals = 0 - -/obj/item/cartridge/virus/frame/send_virus(obj/item/pda/target, mob/living/U) - if(charges <= 0) - to_chat(U, span_notice("Out of charges.")) - return - if(!isnull(target) && !target.toff) - charges-- - var/lock_code = "[rand(100,999)] [pick(GLOB.phonetic_alphabet)]" - to_chat(U, span_notice("Virus Sent! The unlock code to the target is: [lock_code]")) - var/datum/component/uplink/hidden_uplink = target.GetComponent(/datum/component/uplink) - if(!hidden_uplink) - hidden_uplink = target.AddComponent(/datum/component/uplink) - hidden_uplink.unlock_code = lock_code - else - hidden_uplink.hidden_crystals += hidden_uplink.telecrystals //Temporarially hide the PDA's crystals, so you can't steal telecrystals. - hidden_uplink.telecrystals = telecrystals - telecrystals = 0 - hidden_uplink.active = TRUE - else - to_chat(U, "PDA not found.") diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index e4d93b320205..049579a16bec 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -50,17 +50,6 @@ else return ..() -/obj/item/stack/telecrystal/afterattack(obj/item/I, mob/user, proximity) - . = ..() - if(istype(I, /obj/item/cartridge/virus/frame)) - var/obj/item/cartridge/virus/frame/cart = I - if(!cart.charges) - to_chat(user, span_notice("[cart] is out of charges, it's refusing to accept [src].")) - return - cart.telecrystals += amount - use(amount) - to_chat(user, span_notice("You slot [src] into [cart]. The next time it's used, it will also give telecrystals.")) - /obj/item/stack/telecrystal/five amount = 5 diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index ce0d67d9872a..8822500b5003 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -449,10 +449,9 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) id.update_label() if(worn) - if(istype(worn, /obj/item/pda)) - var/obj/item/pda/PDA = worn - PDA.id = id - id.forceMove(PDA) + if(istype(worn, /obj/item/modular_computer)) + var/obj/item/modular_computer/worn_computer = worn + worn_computer.InsertID(id) else if(istype(worn, /obj/item/storage/wallet)) var/obj/item/storage/wallet/W = worn W.front_id = id diff --git a/code/modules/antagonists/bloodsuckers/powers/targeted/lasombra.dm b/code/modules/antagonists/bloodsuckers/powers/targeted/lasombra.dm index 5e5d7ab1fc40..08e30015435f 100644 --- a/code/modules/antagonists/bloodsuckers/powers/targeted/lasombra.dm +++ b/code/modules/antagonists/bloodsuckers/powers/targeted/lasombra.dm @@ -75,8 +75,8 @@ target_atom.visible_message(span_warning("Shadows harden into a translucent wall, blocking passage!")) /datum/action/cooldown/bloodsucker/targeted/lasombra/proc/disintegrate(obj/item/O) - if(istype(O, /obj/item/pda)) - var/obj/item/pda/PDA = O + if(istype(O, /obj/item/modular_computer/tablet/pda)) + var/obj/item/modular_computer/tablet/pda/PDA = O PDA.set_light_on(FALSE) PDA.update_appearance(UPDATE_ICON) O.visible_message(span_danger("The light in [PDA] shorts out!")) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index b7f67d15d085..f53c70dbb386 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -211,9 +211,12 @@ H.equipOutfit(outfit) if(disable_pda) // We don't want corpse PDAs to show up in the messenger list. - var/obj/item/pda/PDA = locate(/obj/item/pda) in H - if(PDA) - PDA.toff = TRUE + var/obj/item/modular_computer/tablet/pda/computer = locate(/obj/item/modular_computer/tablet/pda) in H + if(computer) + var/obj/item/computer_hardware/hard_drive/hdd = computer.all_components[MC_HDD] + var/datum/computer_file/program/pdamessager/messenger_app = locate() in hdd.stored_files + if(messenger_app) + messenger_app.receiving = FALSE if(disable_sensors) // Using crew monitors to find corpses while creative makes finding certain ruins too easy. var/obj/item/clothing/under/C = H.w_uniform @@ -337,7 +340,7 @@ /obj/effect/mob_spawn/human/doctor/alive/equip(mob/living/carbon/human/H) ..() // Remove radio and PDA so they wouldn't annoy station crew. - var/list/del_types = list(/obj/item/pda, /obj/item/radio/headset) + var/list/del_types = list(/obj/item/modular_computer/tablet/pda, /obj/item/radio/headset) for(var/del_type in del_types) var/obj/item/I = locate(del_type) in H qdel(I) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index d3eafcd6e8a9..3a830612c3ca 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -772,38 +772,6 @@ . = ..() chameleon_action.emp_randomise(INFINITY) -/obj/item/pda/chameleon - name = "PDA" - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/pda/chameleon/syndicate - syndicate = TRUE - -/obj/item/pda/chameleon/Initialize(mapload) - . = ..() - chameleon_action = new(src) - if(syndicate) - chameleon_action.syndicate = TRUE - chameleon_action.chameleon_type = /obj/item/pda - chameleon_action.chameleon_name = "PDA" - chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/pda/heads, /obj/item/pda/ai, /obj/item/pda/ai/pai), only_root_path = TRUE) - chameleon_action.initialize_disguises() - add_item_action(chameleon_action) - -/obj/item/pda/chameleon/emp_act(severity) - . = ..() - if(. & EMP_PROTECT_SELF) - return - chameleon_action.emp_randomise() - -/obj/item/pda/chameleon/broken/Initialize(mapload) - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/pda/chameleon/on_chameleon_change() - . = ..() - update_label() - /obj/item/stamp/chameleon var/datum/action/item_action/chameleon/change/chameleon_action diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index d234fd078c12..96ab6946ff8b 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -192,11 +192,6 @@ SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/ammo_box/m44, null, TRUE, TRUE) SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/grenade/plastic/x4, null, TRUE, TRUE) - var/obj/item/pda/heads/pda = H.belt - pda.owner = H.real_name - pda.ownjob = "Reaper" - pda.update_label() - var/obj/item/card/id/syndicate/W = H.wear_id W.access = get_all_accesses() W.assignment = "Reaper" @@ -204,6 +199,9 @@ W.registered_name = H.real_name W.update_label(H.real_name) + var/obj/item/modular_computer/tablet/phone/preset/advanced/command/command_phone = H.belt + command_phone.update_label(W) + /datum/outfit/spec_ops name = "Special Ops Officer" diff --git a/code/modules/goals/department_goals/department_goal.dm b/code/modules/goals/department_goals/department_goal.dm index f6bdd7ff448f..74afd2c7fbaf 100644 --- a/code/modules/goals/department_goals/department_goal.dm +++ b/code/modules/goals/department_goals/department_goal.dm @@ -100,6 +100,7 @@ * * message - Can be either "ded", "new", or "complet". Will output either that the objective has been deleted, created, or completed. */ /datum/department_goal/proc/message_players(message) +/* //does nothing until someone sets it to work with new PDAs. var/string = "Your department's goals have been updated, please have another look at them." switch(message) if("ded") @@ -108,25 +109,12 @@ string = "Your department now has the goal: " + name if("complet") string = "Your department completed the goal: " + name - + var/list/occupationsToSendTo = list() for(var/datum/job/j in SSjob.occupations) if(j.paycheck_department == account) occupationsToSendTo += j.title - - for(var/obj/item/pda/p in GLOB.PDAs) - if(p.ownjob in occupationsToSendTo) - var/datum/signal/subspace/messaging/pda/signal = new(src, list( - "name" = "Central Command", - "job" = "Central Command", - "message" = string, - "language" = /datum/language/common, // NT only uses galactic common. - "targets" = list("[p.owner] ([p.ownjob])") - )) - var/obj/machinery/telecomms/message_server/linkedServer - for(var/obj/machinery/telecomms/message_server/S in GLOB.telecomms_list) - linkedServer = S - linkedServer.receive_information(signal, null) +*/ /** * If the goal is continuous, this will set the timer to now + how-ever-long-the-timer-is diff --git a/code/modules/jobs/job_types/centcom.dm b/code/modules/jobs/job_types/centcom.dm index 04dad777aeb1..8a808fff4316 100644 --- a/code/modules/jobs/job_types/centcom.dm +++ b/code/modules/jobs/job_types/centcom.dm @@ -27,11 +27,6 @@ /datum/outfit/centcom/official/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(visualsOnly) return - if(pdaequip) - var/obj/item/pda/heads/pda = H.r_store - pda.owner = H.real_name - pda.ownjob = "CentCom Official" - pda.update_label() var/obj/item/card/id/W = H.wear_id W.icon = 'icons/obj/card.dmi' //Bypasses modularisation. @@ -43,6 +38,10 @@ W.registered_name = H.real_name W.update_label() + if(pdaequip) + var/obj/item/modular_computer/tablet/phone/preset/advanced/command/command_phone = H.r_store + command_phone.update_label(W) + H.ignores_capitalism = TRUE // Yogs -- Lets Centcom guys buy a damned smoke for christ's sake /datum/outfit/centcom/official/nopda diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 284c7c33629b..4d5c7892e270 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -77,4 +77,3 @@ l_hand = /obj/item/storage/firstaid/medical suit_store = /obj/item/flashlight/pen gloves = /obj/item/clothing/gloves/color/latex/nitrile - pda_type = /obj/item/pda/medical diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index f40f238d3461..aa090a60d22e 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -137,7 +137,6 @@ new /obj/item/storage/backpack/clown(src) new /obj/item/clothing/under/rank/civilian/clown(src) new /obj/item/clothing/shoes/clown_shoes(src) - new /obj/item/pda/clown(src) new /obj/item/clothing/mask/gas/clown_hat(src) new /obj/item/bikehorn(src) new /obj/item/toy/crayon/rainbow(src) @@ -145,7 +144,6 @@ if(95) new /obj/item/clothing/under/rank/civilian/mime(src) new /obj/item/clothing/shoes/sneakers/black(src) - new /obj/item/pda/mime(src) new /obj/item/clothing/gloves/color/white(src) new /obj/item/clothing/mask/gas/mime(src) new /obj/item/clothing/head/beret(src) diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index d942bc2dface..1e4c27b6ae02 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -1420,7 +1420,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(!disable_warning) to_chat(H, "The [I.name] is too big to attach.") //should be src? return FALSE - if( istype(I, /obj/item/pda) || istype(I, /obj/item/pen) || is_type_in_list(I, H.wear_suit.allowed) ) + if( istype(I, /obj/item/modular_computer/tablet/pda) || istype(I, /obj/item/pen) || is_type_in_list(I, H.wear_suit.allowed) ) return TRUE return FALSE if(ITEM_SLOT_HANDCUFFED) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 8d81a51a33d3..87284f977c61 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -15,11 +15,7 @@ if(id) . = id.assignment else - var/obj/item/pda/pda = wear_id - if(istype(pda)) - . = pda.ownjob - else - return if_no_id + return if_no_id if(!.) return if_no_job @@ -29,10 +25,7 @@ var/obj/item/card/id/id = get_idcard(FALSE) if(id) return id.registered_name - var/obj/item/pda/pda = wear_id var/obj/item/modular_computer/tablet/tablet = wear_id - if(istype(pda)) - return pda.owner if(istype(tablet)) return tablet.name return if_no_id @@ -66,15 +59,13 @@ //Useful when player is being seen by other mobs /mob/living/carbon/human/proc/get_id_name(if_no_id = "Unknown") var/obj/item/storage/wallet/wallet = wear_id - var/obj/item/pda/pda = wear_id var/obj/item/card/id/id = wear_id var/obj/item/modular_computer/tablet/tablet = wear_id if(istype(wallet)) id = wallet.front_id + if(istype(id)) . = id.registered_name - else if(istype(pda)) - . = pda.owner else if(istype(tablet)) var/obj/item/computer_hardware/card_slot/card_slot = tablet.all_components[MC_CARD] if(card_slot?.stored_card) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 96029a11af14..bead88f57b76 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -57,7 +57,8 @@ var/obj/machinery/door/hackdoor // The airlock being hacked var/hackprogress = 0 // Possible values: 0 - 100, >= 100 means the hack is complete and will be reset upon next check - var/obj/item/integrated_signaler/signaler // AI's signaller + /// Remote signaler + var/obj/item/assembly/signaler/internal/signaler var/obj/item/instrument/piano_synth/internal_instrument var/obj/machinery/newscaster //pAI Newscaster @@ -85,6 +86,8 @@ var/silent = FALSE var/brightness_power = 5 + var/atom/movable/screen/ai/mod_pc/interfaceButton + /mob/living/silicon/pai/can_unbuckle() return FALSE @@ -122,14 +125,9 @@ aicamera = new /obj/item/camera/siliconcam/ai_camera(src) aicamera.flash_enabled = TRUE - //PDA - aiPDA = new/obj/item/pda/ai(src) - aiPDA.owner = real_name - aiPDA.ownjob = "pAI Messenger" - aiPDA.name = real_name + " (" + aiPDA.ownjob + ")" - . = ..() + create_modularInterface() emittersemicd = TRUE addtimer(CALLBACK(src, PROC_REF(emittercool)), 600) @@ -138,6 +136,18 @@ process_hack() return ..() +/mob/living/silicon/pai/can_interact_with(atom/target) + if(target == signaler) // Bypass for signaler + return TRUE + if(target == modularInterface) + return TRUE + return ..() + +/mob/living/silicon/pai/create_modularInterface() + if(!modularInterface) + modularInterface = new /obj/item/modular_computer/tablet/integrated/pai(src) + return ..() + /mob/living/silicon/pai/proc/process_hack() if(cable && cable.machine && istype(cable.machine, /obj/machinery/door) && cable.machine == hackdoor && get_dist(src, hackdoor) <= 1) diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm index be4d4842bce1..56a6c225366c 100644 --- a/code/modules/mob/living/silicon/pai/pai_shell.dm +++ b/code/modules/mob/living/silicon/pai/pai_shell.dm @@ -20,9 +20,9 @@ addtimer(CALLBACK(src, PROC_REF(emittercool)), emittercd) mobility_flags = MOBILITY_FLAGS_DEFAULT density = TRUE - if(istype(card.loc, /obj/item/pda)) - var/obj/item/pda/P = card.loc - P.pai = null + if(istype(card.loc, /obj/item/modular_computer)) + var/obj/item/modular_computer/P = card.loc + P.inserted_pai = null P.visible_message(span_notice("[src] ejects itself from [P]!")) if(isliving(card.loc)) var/mob/living/L = card.loc diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 77739a90a570..1075cd422684 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -50,8 +50,6 @@ left_part = "" if("directives") left_part = directives() - if("pdamessage") - left_part = pdamessage() if("buy") left_part = downloadSoftware() if("manifest") @@ -191,7 +189,7 @@ if("signaller") if(href_list["send"]) - signaler.send_activation() + signaler.signal() audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*") playsound(src, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) @@ -215,18 +213,6 @@ to_chat(src, "You are not being carried by anyone!") return 0 // FALSE ? If you return here you won't call paiinterface() below - if("pdamessage") - if(!isnull(aiPDA)) - if(href_list["toggler"]) - aiPDA.toff = !aiPDA.toff - else if(href_list["ringer"]) - aiPDA.silent = !aiPDA.silent - else if(href_list["target"]) - if(silent) - return tgui_alert(usr,"Communications circuits remain uninitialized.") - var/target = locate(href_list["target"]) in GLOB.PDAs - aiPDA.create_message(src, target) - if("medicalrecord") // Accessing medical records if(subscreen == 1) medicalActive1 = find_record("id", href_list["med_rec"], GLOB.data_core.general) @@ -312,8 +298,6 @@ // Basic dat += "Basic
" for(var/s in software) - if(s == "digital messenger") - dat += "Digital Messenger
" if(s == "crew manifest") dat += "Crew Manifest
" if(s == "host scan") @@ -633,26 +617,6 @@ to_chat(AI, "Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location.") hacking = TRUE -// Digital Messenger -/mob/living/silicon/pai/proc/pdamessage() - - var/dat = "
Digital Messenger
" - dat += {"Signal/Receiver Status: - [(aiPDA.toff) ? "\[Off\]" : "\[On\]"]- Ringer Status: - [(aiPDA.silent) ? "\[Off\]" : "\[On\]"]
"} - dat += "
- "
- if(!aiPDA.toff)
- for (var/obj/item/pda/P in sortNames(get_viewable_pdas()))
- if (P == aiPDA)
- continue
- dat += "
- [P]" - dat += " " - dat += "
" - dat += "Messages:
[aiPDA.tnote]" - return dat - // Loudness Booster /mob/living/silicon/pai/proc/softwareLoudness() if(!internal_instrument) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 0e64d588266d..2beb6588a216 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -45,7 +45,6 @@ var/interaction_range = 7 //wireless control range ///The reference to the built-in tablet that borgs carry. var/obj/item/modular_computer/tablet/integrated/modularInterface - var/obj/item/pda/aiPDA /mob/living/silicon/Initialize(mapload) . = ..() diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index e7a0fffefb72..86b4e02e86c1 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -81,7 +81,7 @@ visible_message(span_notice("[user] has fixed some of the dents on [src].")) return - else if(istype(O, /obj/item/card/id)||istype(O, /obj/item/pda)) + else if(istype(O, /obj/item/card/id) || istype(O, /obj/item/modular_computer)) if (!mmi) to_chat(user, span_warning("There's no reason to swipe your ID - the spiderbot has no brain to remove.")) return 0 @@ -90,8 +90,8 @@ if(istype(O, /obj/item/card/id)) id_card = O else - var/obj/item/pda/pda = O - id_card = pda.id + var/obj/item/modular_computer/pda = O + id_card = pda.GetID() if(req_access in id_card.GetAccess()) to_chat(user, span_notice("You swipe your access card and pop the brain out of [src].")) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 8d648598ac0e..0ad6d4f52fd8 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1191,14 +1191,12 @@ break search_id = 0 - else if( search_pda && istype(A, /obj/item/pda) ) - var/obj/item/pda/PDA = A - if(PDA.owner == oldname) - PDA.owner = newname - PDA.update_label() - if(!search_id) - break - search_pda = 0 + else if( search_pda && istype(A, /obj/item/modular_computer/tablet) ) + var/obj/item/modular_computer/tablet/PDA_or_phone = A + PDA_or_phone.update_label() + if(!search_id) + break + search_pda = 0 /mob/proc/update_stat() return diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index e8ae20e558f7..ee2512aab24d 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -206,21 +206,6 @@ return card_slot.GetID() return ..() -/obj/item/modular_computer/RemoveID() - var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD] - if(!card_slot) - return - return card_slot.RemoveID() - -/obj/item/modular_computer/InsertID(obj/item/inserting_item) - var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD] - if(!card_slot) - return FALSE - var/obj/item/card/inserting_id = inserting_item.RemoveID() - if(!inserting_id) - return FALSE - return card_slot.try_insert(inserting_id) - /obj/item/modular_computer/MouseDrop(obj/over_object, src_location, over_location) var/mob/M = usr if((!istype(over_object, /atom/movable/screen)) && usr.canUseTopic(src, BE_CLOSE)) @@ -316,15 +301,15 @@ . = ..() update_appearance() - -/obj/item/modular_computer/proc/update_label() - var/obj/item/card/id/stored_id = GetID() +/obj/item/modular_computer/proc/update_label(obj/item/card/id/override_card) + var/obj/item/card/id/stored_id = override_card || GetID() if(id_rename && stored_id) name = "[stored_id.registered_name]'s [initial(name)] ([stored_id.assignment])" var/obj/item/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD] - var/datum/computer_file/program/pdamessager/msgr = hard_drive.find_file_by_name("pda_client") - if(istype(msgr)) - msgr.username = "[stored_id.registered_name] ([stored_id.assignment])" + if(hard_drive) + var/datum/computer_file/program/pdamessager/msgr = hard_drive.find_file_by_name("pda_client") + if(istype(msgr)) + msgr.username = "[stored_id.registered_name] ([stored_id.assignment])" else name = initial(name) diff --git a/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet.dm b/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet.dm index 697200c12ba5..82d471411123 100644 --- a/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet.dm +++ b/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet.dm @@ -64,6 +64,9 @@ CRASH("Cyborg [borgo]'s tablet hard drive rejected recieving a new copy of the self-manage app. To fix, check the hard drive's space remaining. Please make a bug report about this.") return robotact +/obj/item/modular_computer/tablet/integrated/ui_state(mob/user) + return GLOB.deep_inventory_state //it's in the silicon + //Makes the light settings reflect the borg's headlamp settings /obj/item/modular_computer/tablet/integrated/ui_data(mob/user) . = ..() diff --git a/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet_presets.dm b/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet_presets.dm index d5cb2d672f20..6d6fba1bd407 100644 --- a/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet_presets.dm @@ -4,3 +4,11 @@ /obj/item/computer_hardware/hard_drive/small/integrated, /obj/item/computer_hardware/recharger/cyborg, /obj/item/computer_hardware/network_card/integrated) + +/obj/item/modular_computer/tablet/integrated/pai + starting_components = list( + /obj/item/computer_hardware/processor_unit/small, + /obj/item/computer_hardware/hard_drive/small/integrated/pai, + /obj/item/computer_hardware/recharger/cyborg, + /obj/item/computer_hardware/network_card/integrated, + ) diff --git a/code/modules/modular_computers/computers/item/pda/pda_presets.dm b/code/modules/modular_computers/computers/item/pda/pda_presets.dm index 8dfb10e50031..3e564abba1c1 100644 --- a/code/modules/modular_computers/computers/item/pda/pda_presets.dm +++ b/code/modules/modular_computers/computers/item/pda/pda_presets.dm @@ -10,33 +10,39 @@ starting_files = list( new /datum/computer_file/program/budgetorders, new /datum/computer_file/program/bounty_board) + var/reskin_name = null // Name that shows up in PDA painter, or null if forbidden // This is literally the worst possible cheap tablet /obj/item/modular_computer/tablet/pda/preset/basic + reskin_name = "Default" desc = "A standard issue PDA often given to station personnel." /obj/item/modular_computer/tablet/pda/preset/scientist + reskin_name = "Scientist" greyscale_config = /datum/greyscale_config/tablet/stripe_thick greyscale_colors = "#FAFAFA#000099#B347BC" /obj/item/modular_computer/tablet/pda/preset/geneticist + reskin_name = "Geneticist" greyscale_config = /datum/greyscale_config/tablet/stripe_split greyscale_colors = "#FAFAFA#000099#0097CA" /obj/item/modular_computer/tablet/pda/preset/medical + reskin_name = "Medical" greyscale_config = /datum/greyscale_config/tablet/stripe_thick greyscale_colors = "#FAFAFA#000099#3F96CC" /obj/item/modular_computer/tablet/pda/preset/medical/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/crew_monitor, - ) + ) return ..() /obj/item/modular_computer/tablet/pda/preset/medical/chem + reskin_name = "Chemist" greyscale_config = /datum/greyscale_config/tablet/stripe_thick greyscale_colors = "#FAFAFA#355FAC#EA6400" - starting_components = list( + starting_components = list( /obj/item/computer_hardware/processor_unit/pda, /obj/item/stock_parts/cell/computer/micro, /obj/item/computer_hardware/hard_drive/small/pda, @@ -48,30 +54,33 @@ /obj/item/modular_computer/tablet/pda/preset/medical/chem/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/chemscan, - ) + ) return ..() /obj/item/modular_computer/tablet/pda/preset/medical/paramed/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/radar/lifeline, - ) + ) return ..() /obj/item/modular_computer/tablet/pda/preset/medical/viro + reskin_name = "Virologist" greyscale_config = /datum/greyscale_config/tablet/stripe_split greyscale_colors = "#FAFAFA#355FAC#57C451" /obj/item/modular_computer/tablet/pda/preset/robo + reskin_name = "Roboticist" greyscale_config = /datum/greyscale_config/tablet/stripe_split greyscale_colors = "#484848#0099CC#D94927" /obj/item/modular_computer/tablet/pda/preset/robo/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/robocontrol, - ) + ) return ..() /obj/item/modular_computer/tablet/pda/preset/cargo + reskin_name = "Cargo" greyscale_colors = "#D6B328#6506CA" /obj/item/modular_computer/tablet/pda/preset/cargo/Initialize(mapload) @@ -79,10 +88,11 @@ // new /datum/computer_file/program/bounty_board, Both of these come with the preset PDA hardware (/obj/item/computer_hardware/hard_drive/small/pda). // new /datum/computer_file/program/budgetorders, Uncomment if any change is made to that in question. new /datum/computer_file/program/cargobounty, - ) + ) return ..() /obj/item/modular_computer/tablet/pda/preset/cargo/quartermaster + reskin_name = "Quartermaster" greyscale_config = /datum/greyscale_config/tablet/stripe_thick greyscale_colors = "#D6B328#6506CA#927444" @@ -93,10 +103,12 @@ return ..() /obj/item/modular_computer/tablet/pda/preset/shaft_miner + reskin_name = "Shaft Miner" greyscale_config = /datum/greyscale_config/tablet/stripe_thick greyscale_colors = "#927444#D6B328#6C3BA1" /obj/item/modular_computer/tablet/pda/preset/engineering + reskin_name = "Station Engineer" greyscale_config = /datum/greyscale_config/tablet/stripe_thick greyscale_colors = "#D99A2E#69DBF3#E3DF3D" @@ -106,13 +118,14 @@ new /datum/computer_file/program/supermatter_monitor, new /datum/computer_file/program/nuclear_monitor, new /datum/computer_file/program/power_monitor - ) + ) return ..() /obj/item/modular_computer/tablet/pda/preset/atmos + reskin_name = "Atmospheric Technician" greyscale_config = /datum/greyscale_config/tablet/stripe_thick greyscale_colors = "#EEDC43#727272#00E5DA" - starting_components = list( + starting_components = list( /obj/item/computer_hardware/processor_unit/pda, /obj/item/stock_parts/cell/computer/micro, /obj/item/computer_hardware/hard_drive/small/pda, @@ -127,40 +140,49 @@ new /datum/computer_file/program/alarm_monitor, new /datum/computer_file/program/supermatter_monitor, new /datum/computer_file/program/nuclear_monitor - ) + ) return ..() /obj/item/modular_computer/tablet/pda/preset/network_admin + reskin_name = "Network Admin" greyscale_config = /datum/greyscale_config/tablet/stripe_thick greyscale_colors = "#EEDC43#69DBF3#00CC00" /obj/item/modular_computer/tablet/pda/preset/janitor + reskin_name = "Janitor" greyscale_colors = "#933ea8#235AB2" /obj/item/modular_computer/tablet/pda/preset/chaplain + reskin_name = "Chaplain" greyscale_config = /datum/greyscale_config/tablet/chaplain greyscale_colors = "#333333#D11818" /obj/item/modular_computer/tablet/pda/preset/botanist + reskin_name = "Botanist" greyscale_config = /datum/greyscale_config/tablet/stripe_thick greyscale_colors = "#50E193#E26F41#71A7CA" /obj/item/modular_computer/tablet/pda/preset/cook + reskin_name = "Cook" greyscale_colors = "#FAFAFA#A92323" /obj/item/modular_computer/tablet/pda/preset/artist + reskin_name = "Artist" greyscale_colors = "#3E1111#112334" /obj/item/modular_computer/tablet/pda/preset/fountainpen //Lawyer, Curator, Bartender pen_type = /obj/item/pen/fountain /obj/item/modular_computer/tablet/pda/preset/fountainpen/lawyer + reskin_name = "Lawyer" greyscale_colors = "#4C76C8#FFE243" /obj/item/modular_computer/tablet/pda/preset/fountainpen/bartender + reskin_name = "Bartender" greyscale_colors = "#333333#C7C7C7" /obj/item/modular_computer/tablet/pda/preset/fountainpen/curator + reskin_name = "Curator" desc = "A small experimental microcomputer." icon_state = "pda-library" icon_state_unpowered = "pda-library" @@ -171,11 +193,13 @@ // Honk /obj/item/modular_computer/tablet/pda/preset/mime + reskin_name = "Mime" greyscale_config = /datum/greyscale_config/tablet/mime greyscale_colors = "#FAFAFA#EA3232" pen_type = /obj/item/toy/crayon/mime /obj/item/modular_computer/tablet/pda/preset/clown + reskin_name = "Clown" desc = "A hilarious PDA often given to station pranksters." icon_state = "pda-clown" icon_state_unpowered = "pda-clown" @@ -191,19 +215,22 @@ // Honk end /obj/item/modular_computer/tablet/pda/preset/security + reskin_name = "Security" greyscale_colors = "#EA3232#0000CC" /obj/item/modular_computer/tablet/pda/preset/security/detective + reskin_name = "Detective" greyscale_colors = "#805A2F#990202" /obj/item/modular_computer/tablet/pda/preset/security/warden + reskin_name = "Warden" greyscale_config = /datum/greyscale_config/tablet/stripe_split greyscale_colors = "#EA3232#0000CC#363636" /obj/item/modular_computer/tablet/pda/preset/security/warden/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/secureye, - ) + ) return ..() //for inside one of the nukie lockers @@ -240,5 +267,5 @@ starting_files |= list( new /datum/computer_file/program/crew_manifest, new /datum/computer_file/program/paperwork_printer - ) + ) return ..() diff --git a/code/modules/modular_computers/computers/item/phone/phone_presets.dm b/code/modules/modular_computers/computers/item/phone/phone_presets.dm index 4804ecb26652..f647d603657c 100644 --- a/code/modules/modular_computers/computers/item/phone/phone_presets.dm +++ b/code/modules/modular_computers/computers/item/phone/phone_presets.dm @@ -2,8 +2,10 @@ /obj/item/modular_computer/tablet/phone/preset starting_files = list( new /datum/computer_file/program/budgetorders, new /datum/computer_file/program/bounty_board) + var/reskin_name = null // Name that shows up in PDA painter, or null if forbidden /obj/item/modular_computer/tablet/phone/preset/cheap + reskin_name = "Default" desc = "A low-end tablet often seen among low ranked station personnel." starting_components = list( /obj/item/computer_hardware/processor_unit/small, /obj/item/stock_parts/cell/computer/micro, @@ -47,10 +49,11 @@ /obj/item/modular_computer/tablet/phone/preset/advanced/command/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/card_mod - ) + ) . = ..() /obj/item/modular_computer/tablet/phone/preset/advanced/command/cap + reskin_name = "Captain" finish_color = "yellow" pen_type = /obj/item/pen/fountain/captain @@ -59,18 +62,21 @@ RegisterSignal(src, COMSIG_TABLET_CHECK_DETONATE, PROC_REF(pda_no_detonate)) /obj/item/modular_computer/tablet/phone/preset/advanced/command/hop + reskin_name = "Head of Personnel" finish_color = "brown" /obj/item/modular_computer/tablet/phone/preset/advanced/command/hop/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/cargobounty - ) + ) . = ..() /obj/item/modular_computer/tablet/phone/preset/advanced/command/hos + reskin_name = "Head of Security" finish_color = "red" /obj/item/modular_computer/tablet/phone/preset/advanced/command/ce + reskin_name = "Chief Engineer" starting_components = list( /obj/item/computer_hardware/processor_unit/small, /obj/item/stock_parts/cell/computer, /obj/item/computer_hardware/hard_drive/small/pda, @@ -88,6 +94,7 @@ . = ..() /obj/item/modular_computer/tablet/phone/preset/advanced/command/rd + reskin_name = "Research Director" finish_color = "purple" pen_type = /obj/item/pen/fountain @@ -96,6 +103,7 @@ . = ..() /obj/item/modular_computer/tablet/phone/preset/advanced/command/cmo + reskin_name = "Chief Medical Officer" finish_color = "white" /obj/item/modular_computer/tablet/phone/preset/advanced/command/cmo/Initialize(mapload) diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 620220a694f7..44250d02a4a8 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -197,6 +197,10 @@ generate_network_log("Connection to [network_destination] closed.") return TRUE +/datum/computer_file/program/ui_state(mob/user) + if(ispAI(user)) + return GLOB.deep_inventory_state + return ..() /datum/computer_file/program/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm index f14950be589e..45c31c0e2e34 100644 --- a/code/modules/modular_computers/hardware/hard_drive.dm +++ b/code/modules/modular_computers/hardware/hard_drive.dm @@ -180,7 +180,7 @@ // For silicon integrated tablets. /obj/item/computer_hardware/hard_drive/small/integrated/install_default_programs() ..() - var/datum/computer_file/program/pdamessager/P = store_file(new/datum/computer_file/program/pdamessager(src)) + var/datum/computer_file/program/pdamessager/P = store_file(new /datum/computer_file/program/pdamessager(src)) var/obj/item/modular_computer/stored = holder if(!stored && istype(loc, /obj/item/modular_computer)) stored = loc @@ -204,6 +204,13 @@ if(istype(stored?.loc, /mob/living/silicon/robot)) // RoboTact is for cyborgs only, not AIs store_file(new /datum/computer_file/program/robotact(src)) +/obj/item/computer_hardware/hard_drive/small/integrated/pai + //does not come with an ntnet store. + default_programs = list( + /datum/computer_file/program/computerconfig, + /datum/computer_file/program/filemanager, + ) + // Syndicate variant - very slight better /obj/item/computer_hardware/hard_drive/small/syndicate desc = "An efficient SSD for portable devices developed by a rival organisation." diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index 45e6b403b591..10872d6bb3b2 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -250,7 +250,7 @@ id = worn.GetID() if(id) id.icon_state = "gold" - id.access = get_all_accesses()+get_all_centcom_access() + id.access = get_all_accesses() + get_all_centcom_access() id.assignment = "Captain" id.originalassignment = "Captain" id.update_label() @@ -262,10 +262,9 @@ id.originalassignment = "Captain" id.update_label() if(worn) - if(istype(worn, /obj/item/pda)) - var/obj/item/pda/PDA = worn - PDA.id = id - id.forceMove(worn) + if(istype(worn, /obj/item/modular_computer)) + var/obj/item/modular_computer/worn_computer = worn + worn_computer.InsertID(id) else if(istype(worn, /obj/item/storage/wallet)) var/obj/item/storage/wallet/W = worn W.front_id = id diff --git a/yogstation.dme b/yogstation.dme index 89f49da8548f..2177a726ddbc 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -1407,11 +1407,6 @@ #include "code\game\objects\items\devices\busterarm\gasharpoon.dm" #include "code\game\objects\items\devices\busterarm\megabuster.dm" #include "code\game\objects\items\devices\busterarm\wire_snatch.dm" -#include "code\game\objects\items\devices\PDA\cart.dm" -#include "code\game\objects\items\devices\PDA\PDA.dm" -#include "code\game\objects\items\devices\PDA\PDA_types.dm" -#include "code\game\objects\items\devices\PDA\radio.dm" -#include "code\game\objects\items\devices\PDA\virus_cart.dm" #include "code\game\objects\items\devices\radio\electropack.dm" #include "code\game\objects\items\devices\radio\encryptionkey.dm" #include "code\game\objects\items\devices\radio\headset.dm" @@ -4190,9 +4185,6 @@ #include "yogstation\code\game\objects\items\circuitboards\machine_circuitboards.dm" #include "yogstation\code\game\objects\items\devices\powersink.dm" #include "yogstation\code\game\objects\items\devices\scanners.dm" -#include "yogstation\code\game\objects\items\devices\PDA\cart.dm" -#include "yogstation\code\game\objects\items\devices\PDA\PDA.dm" -#include "yogstation\code\game\objects\items\devices\PDA\PDA_types.dm" #include "yogstation\code\game\objects\items\devices\radio\encryptionkey.dm" #include "yogstation\code\game\objects\items\devices\radio\headset.dm" #include "yogstation\code\game\objects\items\devices\radio\radio.dm" @@ -4340,7 +4332,6 @@ #include "yogstation\code\modules\client\verbs\antag_token.dm" #include "yogstation\code\modules\client\verbs\looc.dm" #include "yogstation\code\modules\client\verbs\ooc.dm" -#include "yogstation\code\modules\clothing\chameleon.dm" #include "yogstation\code\modules\clothing\clothing.dm" #include "yogstation\code\modules\clothing\donator.dm" #include "yogstation\code\modules\clothing\fishing.dm" diff --git a/yogstation/code/game/objects/items/devices/PDA/PDA.dm b/yogstation/code/game/objects/items/devices/PDA/PDA.dm deleted file mode 100644 index 76fe3693d5d9..000000000000 --- a/yogstation/code/game/objects/items/devices/PDA/PDA.dm +++ /dev/null @@ -1,8 +0,0 @@ -/obj/item/pda/CtrlClick(mob/user) - if(user.contains_atom(src)) - attack_self(user) - return TRUE - return ..() - -/obj/item/pda - light_color = "#ffffff" diff --git a/yogstation/code/game/objects/items/devices/PDA/PDA_types.dm b/yogstation/code/game/objects/items/devices/PDA/PDA_types.dm deleted file mode 100644 index 935d444e14b5..000000000000 --- a/yogstation/code/game/objects/items/devices/PDA/PDA_types.dm +++ /dev/null @@ -1,107 +0,0 @@ -/obj/item/pda/network_admin - name = "\improper antique telecomms PDA" - default_cartridge = /obj/item/cartridge/signal - icon_state = "pda_tcomms" - light_color = LIGHT_COLOR_ORANGE - -/obj/item/pda/para - name = "\improper antique paramedic PDA" - default_cartridge = /obj/item/cartridge/paramedic - icon_state = "pda-medical" - light_color = LIGHT_COLOR_LIGHT_CYAN - -/obj/item/pda/miningmed - name = "\improper antique mining medic PDA" - default_cartridge = /obj/item/cartridge/medical - icon_state = "pda-miningmed" - light_color = LIGHT_COLOR_LIGHT_CYAN - -/obj/item/pda/physician - name = "\improper antique brig physician PDA" - default_cartridge = /obj/item/cartridge/medical - icon_state = "pda-physician" - light_color = LIGHT_COLOR_RED - -/obj/item/pda/clown - light_color = LIGHT_COLOR_PINK - -/obj/item/pda/medical - light_color = LIGHT_COLOR_LIGHT_CYAN - -/obj/item/pda/viro - light_color = LIGHT_COLOR_LIGHT_CYAN - -/obj/item/pda/engineering - light_color = LIGHT_COLOR_ORANGE - -/obj/item/pda/security - light_color = LIGHT_COLOR_RED - -/obj/item/pda/detective - light_color = LIGHT_COLOR_RED - -/obj/item/pda/warden - light_color = LIGHT_COLOR_RED - -/obj/item/pda/janitor - light_color = LIGHT_COLOR_LAVENDER - -/obj/item/pda/toxins - light_color = LIGHT_COLOR_PURPLE - -/obj/item/pda/heads/hop - light_color = LIGHT_COLOR_BLUE - -/obj/item/pda/heads/hos - light_color = LIGHT_COLOR_FLARE - -/obj/item/pda/heads/ce - light_color = LIGHT_COLOR_FIRE - -/obj/item/pda/heads/cmo - light_color = LIGHT_COLOR_CYAN - -/obj/item/pda/heads/rd - light_color = LIGHT_COLOR_PURPLE - -/obj/item/pda/captain - light_color = LIGHT_COLOR_BLUE - -/obj/item/pda/cargo - light_color = LIGHT_COLOR_YELLOW - -/obj/item/pda/quartermaster - light_color = LIGHT_COLOR_BROWN - -/obj/item/pda/shaftminer - light_color = LIGHT_COLOR_YELLOW - -/obj/item/pda/syndicate - light_color = LIGHT_COLOR_FIRE - -/obj/item/pda/chaplain - light_color = LIGHT_COLOR_SLIME_LAMP - -/obj/item/pda/lawyer - light_color = LIGHT_COLOR_DARK_BLUE - -/obj/item/pda/botanist - light_color = LIGHT_COLOR_BLUEGREEN - -/obj/item/pda/roboticist - light_color = LIGHT_COLOR_PURPLE - -/obj/item/pda/curator - light_color = LIGHT_COLOR_SLIME_LAMP - -/obj/item/pda/bar - light_color = LIGHT_COLOR_SLIME_LAMP - -/obj/item/pda/atmos - light_color = LIGHT_COLOR_ORANGE - -/obj/item/pda/chemist - light_color = LIGHT_COLOR_LIGHT_CYAN - -/obj/item/pda/geneticist - light_color = LIGHT_COLOR_LIGHT_CYAN diff --git a/yogstation/code/game/objects/items/devices/PDA/cart.dm b/yogstation/code/game/objects/items/devices/PDA/cart.dm deleted file mode 100644 index b5bcf0efbe44..000000000000 --- a/yogstation/code/game/objects/items/devices/PDA/cart.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/item/cartridge/paramedic - name = "\improper ParaHotline cartridge" - icon_state = "cart-m" - access = CART_MEDICAL - bot_access_flags = MED_BOT \ No newline at end of file diff --git a/yogstation/code/modules/antagonists/infiltrator/outfit.dm b/yogstation/code/modules/antagonists/infiltrator/outfit.dm index fd1041e4c7e2..c7065131bd3a 100644 --- a/yogstation/code/modules/antagonists/infiltrator/outfit.dm +++ b/yogstation/code/modules/antagonists/infiltrator/outfit.dm @@ -39,8 +39,6 @@ card.access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE) card.update_label() - var/obj/item/pda/pda = H.belt - if(istype(pda)) - pda.owner = H.real_name - pda.ownjob = "Assistant" - pda.update_label() + var/obj/item/modular_computer/worn_computer = H.belt + if(istype(worn_computer)) + worn_computer.update_label(card) diff --git a/yogstation/code/modules/clothing/chameleon.dm b/yogstation/code/modules/clothing/chameleon.dm deleted file mode 100644 index 74215f6649ea..000000000000 --- a/yogstation/code/modules/clothing/chameleon.dm +++ /dev/null @@ -1,4 +0,0 @@ -/datum/action/item_action/chameleon/change/update_item(obj/item/picked_item, obj/item/target = target) - ..() - if(ispath(picked_item, /obj/item/pda) && istype(target, /obj/item/pda)) - target.set_light_color(initial(picked_item.light_color)) diff --git a/yogstation/code/modules/vending/gift.dm b/yogstation/code/modules/vending/gift.dm index 4f68877106ff..f3ef1c82485f 100644 --- a/yogstation/code/modules/vending/gift.dm +++ b/yogstation/code/modules/vending/gift.dm @@ -93,33 +93,17 @@ /obj/item/flashlight/flare/signal = 1, /obj/item/storage/toolbox/mechanical = 1, /obj/item/stack/cable_coil/random = 4, - /obj/item/pda = 8, //Keeping these so the clerk can still sell their amazing "antique PDAs" - /obj/item/cartridge/engineering = 2, - /obj/item/cartridge/atmos = 2, - /obj/item/cartridge/medical = 2, - /obj/item/cartridge/chemistry = 2, - /obj/item/cartridge/janitor = 2, - /obj/item/cartridge/lawyer = 2, - /obj/item/cartridge/curator = 2, - /obj/item/cartridge/roboticist = 2, - /obj/item/cartridge/quartermaster = 2) - contraband = list(/obj/item/clothing/under/yogs/psyche = 1, - /obj/item/instrument/violin/golden = 1, - /obj/item/clothing/gloves/color/fyellow = 1, - /obj/item/airlock_painter = 1, - /obj/item/cartridge/security = 2, - /obj/item/cartridge/detective = 2, - /obj/item/cartridge/quartermaster = 2, - /obj/item/cartridge/head = 2, - /obj/item/cartridge/hop = 2, - /obj/item/cartridge/hos = 2, - /obj/item/cartridge/ce = 2, - /obj/item/cartridge/cmo = 2, - /obj/item/cartridge/rd = 2, - /obj/item/cartridge/captain = 1) - premium = list(/obj/item/multitool = 1, - /obj/item/clothing/head/soft/fishfear = 4, - /obj/item/pda/clear = 1) + ) + contraband = list( + /obj/item/clothing/under/yogs/psyche = 1, + /obj/item/instrument/violin/golden = 1, + /obj/item/clothing/gloves/color/fyellow = 1, + /obj/item/airlock_painter = 1, + ) + premium = list( + /obj/item/multitool = 1, + /obj/item/clothing/head/soft/fishfear = 4, + ) default_price = 50 extra_price = 75