From ecea3a506bd10f450653af5893a7b811414cafe5 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 16 Jul 2023 04:22:00 +0200 Subject: [PATCH] [MIRROR] Clear PDAs now specify they are a crystal PDA in messenger [MDB IGNORE] (#22484) * Clear PDAs now specify they are a crystal PDA in messenger * Merge conflict --------- Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Giz --- code/modules/modular_computers/computers/item/computer.dm | 4 ++++ code/modules/modular_computers/computers/item/laptop.dm | 3 ++- code/modules/modular_computers/computers/item/processor.dm | 3 +++ .../modular_computers/computers/item/role_tablet_presets.dm | 3 +++ .../modular_computers/file_system/programs/ntmessenger.dm | 4 ++-- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 3b4133f4d65..c6c1775a550 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -825,3 +825,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar /obj/item/modular_computer/proc/Remove_Messenger() GLOB.TabletMessengers -= src + +///Returns a string of what to send at the end of messenger's messages. +/obj/item/modular_computer/proc/get_messenger_ending() + return "Sent from my PDA" diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm index ceb4d61cc9a..d3b620cdfc9 100644 --- a/code/modules/modular_computers/computers/item/laptop.dm +++ b/code/modules/modular_computers/computers/item/laptop.dm @@ -119,7 +119,8 @@ screen_on = !screen_on update_appearance() - +/obj/item/modular_computer/laptop/get_messenger_ending() + return "Sent from my UNIX Laptop" // Laptop frame, starts empty and closed. /obj/item/modular_computer/laptop/buildable diff --git a/code/modules/modular_computers/computers/item/processor.dm b/code/modules/modular_computers/computers/item/processor.dm index 4c032849b50..01c04ed68cd 100644 --- a/code/modules/modular_computers/computers/item/processor.dm +++ b/code/modules/modular_computers/computers/item/processor.dm @@ -46,3 +46,6 @@ /obj/item/modular_computer/processor/relay_qdel() qdel(machinery_computer) + +/obj/item/modular_computer/processor/get_messenger_ending() + return "Sent from my Desktop" diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index e49f9c6753d..9a55eae256a 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -430,3 +430,6 @@ if(theme_app) for(var/theme_key in GLOB.pda_name_to_theme - GLOB.default_pda_themes) theme_app.imported_themes += theme_key + +/obj/item/modular_computer/pda/clear/get_messenger_ending() + return "Sent from my crystal PDA" diff --git a/code/modules/modular_computers/file_system/programs/ntmessenger.dm b/code/modules/modular_computers/file_system/programs/ntmessenger.dm index 81364ed7b8f..4d8600cf759 100644 --- a/code/modules/modular_computers/file_system/programs/ntmessenger.dm +++ b/code/modules/modular_computers/file_system/programs/ntmessenger.dm @@ -291,8 +291,8 @@ if(ishuman(user)) var/mob/living/carbon/human/old_person = user sent_prob = old_person.age >= 30 ? 25 : sent_prob - if (prob(sent_prob)) - message += " Sent from my PDA" + if (computer && prob(sent_prob)) + message += " [computer.get_messenger_ending()]" // SKYRAT EDIT BEGIN - PDA messages show a visible message; again! user.visible_message(span_notice("[user]'s PDA rings out with the soft sound of keypresses."), vision_distance = COMBAT_MESSAGE_RANGE) //SKYRAT EDIT END