diff --git a/code/modules/modular_computers/file_system/programs/app_presets.dm b/code/modules/modular_computers/file_system/programs/app_presets.dm index cb6e9d5b3c6..ef971b6d951 100644 --- a/code/modules/modular_computers/file_system/programs/app_presets.dm +++ b/code/modules/modular_computers/file_system/programs/app_presets.dm @@ -29,6 +29,8 @@ /datum/modular_computer_app_presets/engineering/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), new /datum/computer_file/program/power_monitor(), @@ -50,6 +52,8 @@ /datum/modular_computer_app_presets/engineering/ce/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), new /datum/computer_file/program/comm(FALSE), @@ -74,6 +78,8 @@ /datum/modular_computer_app_presets/medical/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), new /datum/computer_file/program/suit_sensors(), @@ -91,6 +97,8 @@ /datum/modular_computer_app_presets/medical/cmo/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), new /datum/computer_file/program/comm(FALSE), @@ -110,6 +118,8 @@ /datum/modular_computer_app_presets/research/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/ntnetdownload(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/filemanager(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), @@ -128,6 +138,8 @@ /datum/modular_computer_app_presets/research/rd/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), new /datum/computer_file/program/comm(FALSE), @@ -147,6 +159,8 @@ /datum/modular_computer_app_presets/command/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), new /datum/computer_file/program/card_mod(), @@ -165,6 +179,8 @@ /datum/modular_computer_app_presets/command/hop/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), new /datum/computer_file/program/civilian/cargocontrol(), @@ -185,6 +201,8 @@ /datum/modular_computer_app_presets/captain/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/card_mod(), new /datum/computer_file/program/comm(FALSE), @@ -210,6 +228,8 @@ /datum/modular_computer_app_presets/security/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/nttransfer(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/filemanager(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), @@ -231,6 +251,8 @@ /datum/modular_computer_app_presets/security/investigations/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/nttransfer(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/filemanager(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/camera_monitor(), @@ -252,6 +274,8 @@ /datum/modular_computer_app_presets/security/hos/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/nttransfer(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/filemanager(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), @@ -274,6 +298,8 @@ /datum/modular_computer_app_presets/civilian/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), new /datum/computer_file/program/game/arcade(), @@ -291,6 +317,8 @@ /datum/modular_computer_app_presets/supply/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargocontrol(), new /datum/computer_file/program/civilian/cargoorder(), @@ -308,6 +336,8 @@ /datum/modular_computer_app_presets/cargo_delivery/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargodelivery(), new /datum/computer_file/program/ntsl2_interpreter() @@ -323,6 +353,8 @@ /datum/modular_computer_app_presets/representative/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/game/sudoku(), new /datum/computer_file/program/civilian/cargoorder(), @@ -340,6 +372,8 @@ /datum/modular_computer_app_presets/wall_generic/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), new /datum/computer_file/program/camera_monitor(), @@ -357,6 +391,8 @@ /datum/modular_computer_app_presets/merc/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/newsbrowser(), + new /datum/computer_file/program/manifest(), new /datum/computer_file/program/nttransfer(), new /datum/computer_file/program/camera_monitor/hacked() ) @@ -403,6 +439,8 @@ /datum/modular_computer_app_presets/merchant/return_install_programs() var/list/_prg_list = list( new /datum/computer_file/program/filemanager(), + new /datum/computer_file/program/manifest(), + new /datum/computer_file/program/newsbrowser(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/merchant() ) diff --git a/code/modules/modular_computers/file_system/programs/civilian/cargo_order.dm b/code/modules/modular_computers/file_system/programs/civilian/cargo_order.dm index a725b461ea1..a144d1db395 100644 --- a/code/modules/modular_computers/file_system/programs/civilian/cargo_order.dm +++ b/code/modules/modular_computers/file_system/programs/civilian/cargo_order.dm @@ -5,7 +5,7 @@ size = 10 requires_ntnet = TRUE available_on_ntnet = TRUE - usage_flags = PROGRAM_LAPTOP | PROGRAM_TELESCREEN | PROGRAM_CONSOLE + usage_flags = PROGRAM_ALL nanomodule_path = /datum/nano_module/program/civilian/cargoorder /datum/nano_module/program/civilian/cargoorder @@ -24,7 +24,7 @@ if(!co) var/datum/cargo_order/crord = new co = crord - + var/list/data = host.initial_data() //Pass the ID Data @@ -109,7 +109,7 @@ co.ordered_by = last_user_name co.reason = reason co.set_submitted() - status_message = "Order submitted successfully. Order ID: [co.order_id] Tracking code: [co.get_tracking_code()]" + status_message = "Order submitted successfully. Order ID: [co.order_id] Tracking code: [co.get_tracking_code()]" //TODO: Print a list with the order data co = null return TRUE @@ -136,7 +136,7 @@ //page = "main" //selected_item = "" return TRUE - + //Remove item from the order list if(href_list["remove_item"]) status_message = co.remove_item(text2num(href_list["remove_item"])) @@ -172,7 +172,7 @@ if(href_list["select_category"]) selected_category = href_list["select_category"] return TRUE - + if(href_list["clear_message"]) status_message = null return TRUE \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/engineering/_engineering.dm b/code/modules/modular_computers/file_system/programs/engineering/_engineering.dm index 03e62d5bd92..efe9e797829 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/_engineering.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/_engineering.dm @@ -11,6 +11,7 @@ required_access_download = access_ce requires_ntnet = TRUE network_destination = "power monitoring system" + usage_flags = PROGRAM_ALL size = 9 var/has_alert = FALSE color = LIGHT_COLOR_ORANGE @@ -40,6 +41,7 @@ extended_desc = "This program provides visual interface for station's alarm system." requires_ntnet = TRUE network_destination = "alarm monitoring network" + usage_flags = PROGRAM_ALL size = 5 var/has_alert = FALSE color = LIGHT_COLOR_CYAN diff --git a/code/modules/modular_computers/file_system/programs/generic/manifest.dm b/code/modules/modular_computers/file_system/programs/generic/manifest.dm index 108c1738ea6..14bb88b9c45 100644 --- a/code/modules/modular_computers/file_system/programs/generic/manifest.dm +++ b/code/modules/modular_computers/file_system/programs/generic/manifest.dm @@ -3,6 +3,7 @@ filedesc = "Crew Manifest" program_icon_state = "generic" extended_desc = "This program is used for viewing the crew manifest." + usage_flags = PROGRAM_ALL size = 3 requires_ntnet = 1 diff --git a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm index 25e9dc58a16..c033a4d797a 100644 --- a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm @@ -3,6 +3,7 @@ filedesc = "NTNet/ExoNet News Browser" extended_desc = "This program may be used to view and download news articles from the network." program_icon_state = "generic" + usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET | PROGRAM_STATIONBOUND | PROGRAM_WRISTBOUND size = 2 requires_ntnet = TRUE available_on_ntnet = TRUE diff --git a/code/modules/modular_computers/file_system/programs/generic/ntsl2_interpreter.dm b/code/modules/modular_computers/file_system/programs/generic/ntsl2_interpreter.dm index 46e12f31eea..a00f0192ea5 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntsl2_interpreter.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntsl2_interpreter.dm @@ -3,6 +3,7 @@ filedesc = "NTSL2+ Interpreter" extended_desc = "This program is used to run NTSL2+ programs." program_icon_state = "generic" + usage_flags = PROGRAM_ALL size = 8 requires_ntnet = TRUE available_on_ntnet = TRUE diff --git a/html/changelogs/paradoxspace-personalcomputer.yml b/html/changelogs/paradoxspace-personalcomputer.yml new file mode 100644 index 00000000000..a2a6784b3bc --- /dev/null +++ b/html/changelogs/paradoxspace-personalcomputer.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: ParadoxSpace + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Some Engineering programs have been re-added to function on wristbounds." + - rscadd: "All computers can now run Cargo Order and NTSL2 Interpreter." + - rscadd: "Everyone now gets a Crew Manifest and News Browser on their computers."