diff --git a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm index d67217964d1..d19a37c001c 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm @@ -77,6 +77,10 @@ desc = "A portable computer belonging to the captain." _app_preset_type = /datum/modular_computer_app_presets/captain +/obj/item/modular_computer/laptop/preset/command/captain/install_default_hardware() + ..() + card_slot = new /obj/item/computer_hardware/card_slot(src) + // Security /obj/item/modular_computer/laptop/preset/security/ name = "security laptop" 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 edaf0c3c54e..eaf63f8e939 100644 --- a/code/modules/modular_computers/file_system/programs/app_presets.dm +++ b/code/modules/modular_computers/file_system/programs/app_presets.dm @@ -51,6 +51,7 @@ new /datum/computer_file/program/filemanager(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), + new /datum/computer_file/program/comm(FALSE), new /datum/computer_file/program/game/sudoku(), new /datum/computer_file/program/power_monitor(), new /datum/computer_file/program/alarm_monitor(), @@ -89,6 +90,7 @@ new /datum/computer_file/program/filemanager(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), + new /datum/computer_file/program/comm(FALSE), new /datum/computer_file/program/suit_sensors(), new /datum/computer_file/program/records/employment(), new /datum/computer_file/program/records/medical() @@ -122,6 +124,7 @@ new /datum/computer_file/program/filemanager(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), + new /datum/computer_file/program/comm(FALSE), new /datum/computer_file/program/ntnetmonitor(), new /datum/computer_file/program/aidiag(), new /datum/computer_file/program/records/employment() @@ -140,7 +143,7 @@ new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), new /datum/computer_file/program/card_mod(), - new /datum/computer_file/program/comm(TRUE), + new /datum/computer_file/program/comm(FALSE), new /datum/computer_file/program/records/employment() ) return _prg_list @@ -158,6 +161,7 @@ new /datum/computer_file/program/civilian/cargoorder(), new /datum/computer_file/program/civilian/cargocontrol(), new /datum/computer_file/program/card_mod(), + new /datum/computer_file/program/comm(FALSE), new /datum/computer_file/program/records/employment(), new /datum/computer_file/program/records/security() ) @@ -174,7 +178,7 @@ new /datum/computer_file/program/filemanager(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/card_mod(), - new /datum/computer_file/program/comm(TRUE), + new /datum/computer_file/program/comm(FALSE), new /datum/computer_file/program/camera_monitor(), new /datum/computer_file/program/digitalwarrant(), new /datum/computer_file/program/penal_mechs(), @@ -236,6 +240,7 @@ new /datum/computer_file/program/filemanager(), new /datum/computer_file/program/chatclient(), new /datum/computer_file/program/civilian/cargoorder(), + new /datum/computer_file/program/comm(FALSE), new /datum/computer_file/program/camera_monitor(), new /datum/computer_file/program/digitalwarrant(), new /datum/computer_file/program/penal_mechs(), @@ -347,7 +352,7 @@ new /datum/computer_file/program/filemanager(), new /datum/computer_file/program/ntnetdownload(), new /datum/computer_file/program/camera_monitor/hacked(), - new /datum/computer_file/program/comm(TRUE), + new /datum/computer_file/program/comm(FALSE), new /datum/computer_file/program/suit_sensors(), new /datum/computer_file/program/alarm_monitor(), new /datum/computer_file/program/lighting_control(), diff --git a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm index ec55adfe45e..cdf02ebdb22 100644 --- a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm +++ b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm @@ -8,7 +8,7 @@ requires_ntnet = TRUE network_destination = "crew lifesigns monitoring system" size = 11 - usage_flags = PROGRAM_LAPTOP | PROGRAM_TELESCREEN | PROGRAM_CONSOLE | PROGRAM_SILICON + usage_flags = PROGRAM_LAPTOP | PROGRAM_TELESCREEN | PROGRAM_CONSOLE | PROGRAM_SILICON | PROGRAM_TABLET color = LIGHT_COLOR_CYAN /datum/computer_file/program/suit_sensors/ui_interact(mob/user) @@ -57,4 +57,4 @@ var/mob/living/silicon/ai/AI = usr var/mob/living/carbon/human/H = locate(href_list["track"]) in mob_list if(hassensorlevel(H, SUIT_SENSOR_TRACKING)) - AI.ai_actual_track(H) \ No newline at end of file + AI.ai_actual_track(H) \ No newline at end of file diff --git a/html/changelogs/furrycactus - command laptops.yml b/html/changelogs/furrycactus - command laptops.yml new file mode 100644 index 00000000000..580976ba8ac --- /dev/null +++ b/html/changelogs/furrycactus - command laptops.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: Furrycactus + +# 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: "Tablet computers can now run the Medical Suit Sensors Monitoring program." + - rscadd: "All head of staff laptops possess a Command and Communications Program now." + - bugfix: "The Captain's laptop has an ID card reader now, so that the ID Card Modification program can actually be used."