diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 81e17a5fef2..8f4764e6674 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -318,8 +318,8 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar if(response == "Yes") turn_on(user) -/obj/item/modular_computer/emag_act(mob/user) - if(!enabled) +/obj/item/modular_computer/emag_act(mob/user, forced) + if(!enabled && !forced) to_chat(user, span_warning("You'd need to turn the [src] on first.")) return FALSE obj_flags |= EMAGGED //Mostly for consistancy purposes; the programs will do their own emag handling diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm index 1e39ee32a1f..c362168c21a 100644 --- a/code/modules/modular_computers/computers/item/pda.dm +++ b/code/modules/modular_computers/computers/item/pda.dm @@ -253,23 +253,21 @@ /obj/item/modular_computer/pda/nukeops name = "nuclear pda" device_theme = "syndicate" - has_pda_programs = FALSE comp_light_luminosity = 6.3 //matching a flashlight light_color = COLOR_RED greyscale_config = /datum/greyscale_config/tablet/stripe_thick greyscale_colors = "#a80001#5C070F#000000" - + long_ranged = TRUE starting_programs = list( - /datum/computer_file/program/ntnetdownload/syndicate, /datum/computer_file/program/radar/fission360, ) -/obj/item/modular_computer/pda/nukeops/emag_act(mob/user) - if(!enabled) - to_chat(user, span_warning("You'd need to turn the [src] on first.")) - return FALSE - to_chat(user, span_notice("You swipe \the [src]. It's screen briefly shows a message reading \"MEMORY CODE INJECTION DETECTED AND SUCCESSFULLY QUARANTINED\".")) - return FALSE +/obj/item/modular_computer/pda/nukeops/Initialize(mapload) + . = ..() + emag_act(forced = TRUE) + var/datum/computer_file/program/messenger/msg = locate() in stored_files + if(msg) + msg.invisible = TRUE /** * Silicon PDA diff --git a/code/modules/modular_computers/file_system/programs/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/ntdownloader.dm index 36d415257bf..81d27549580 100644 --- a/code/modules/modular_computers/file_system/programs/ntdownloader.dm +++ b/code/modules/modular_computers/file_system/programs/ntdownloader.dm @@ -177,24 +177,3 @@ /datum/computer_file/program/ntnetdownload/kill_program(forced) abort_file_download() return ..() - -//////////////////////// -//Syndicate Downloader// -//////////////////////// - -/// This app only lists programs normally found in the emagged section of the normal downloader app - -/datum/computer_file/program/ntnetdownload/syndicate - filename = "syndownloader" - filedesc = "Software Download Tool" - program_icon_state = "generic" - extended_desc = "This program allows downloads of software from shared Syndicate repositories" - requires_ntnet = FALSE - ui_header = "downloader_finished.gif" - tgui_id = "NtosNetDownloader" - emagged = TRUE - -/datum/computer_file/program/ntnetdownload/syndicate/on_start() - . = ..() - main_repo = SSmodular_computers.available_antag_software - antag_repo = null