From 360242ee83d2770f11b1c540fef0317b2611dfba Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 26 Apr 2022 16:50:31 +0200 Subject: [PATCH] [MIRROR] adds pda paper scanning, and gives head job disks the tech web [MDB IGNORE] (#13133) * adds pda paper scanning, and gives head job disks the tech web (#66470) lets you uhhh scan papers i nto your notes app and also uhhh gives all heads the techweb app and also uhhh removes some role tablets because they dont really like need them anymore yeah cool awesome coming one step closer to orange's vision of having techweb be heads only * adds pda paper scanning, and gives head job disks the tech web Co-authored-by: magatsuchi <88991542+magatsuchi@users.noreply.github.com> --- code/__DEFINES/devices.dm | 1 + code/modules/jobs/job_types/research_director.dm | 1 - code/modules/jobs/job_types/roboticist.dm | 3 --- code/modules/jobs/job_types/scientist.dm | 3 --- code/modules/jobs/job_types/security_officer.dm | 1 - code/modules/jobs/job_types/station_engineer.dm | 3 --- code/modules/jobs/job_types/warden.dm | 1 - .../modular_computers/computers/item/tablet.dm | 6 ++++++ .../modular_computers/hardware/job_disk.dm | 15 +++++++++------ 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/code/__DEFINES/devices.dm b/code/__DEFINES/devices.dm index d76f56168a9..3ce3052fb00 100644 --- a/code/__DEFINES/devices.dm +++ b/code/__DEFINES/devices.dm @@ -13,6 +13,7 @@ #define DISK_JANI (1<<10) #define DISK_SEC (1<<11) #define DISK_BUDGET (1<<12) +#define DISK_SCI (1<<13) // Used to stringify message targets before sending the signal datum. #define STRINGIFY_PDA_TARGET(name, job) "[name] ([job])" diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 56d3001df5e..87c0c058f28 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -60,7 +60,6 @@ suit = /obj/item/clothing/suit/toggle/labcoat/rd //SKYRAT EDIT CHANGE backpack_contents = list( /obj/item/melee/baton/telescopic = 1, - /obj/item/modular_computer/tablet/preset/advanced/command = 1, ) belt = /obj/item/modular_computer/tablet/pda/heads/rd ears = /obj/item/radio/headset/heads/rd diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index fc26e072dfc..86b75d5441e 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -45,9 +45,6 @@ id_trim = /datum/id_trim/job/roboticist uniform = /obj/item/clothing/under/rank/rnd/roboticist suit = /obj/item/clothing/suit/toggle/labcoat/roboticist - backpack_contents = list( - /obj/item/modular_computer/tablet/preset/science = 1, - ) belt = /obj/item/storage/belt/utility/full ears = /obj/item/radio/headset/headset_sci l_pocket = /obj/item/modular_computer/tablet/pda/roboticist diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index 23941f90407..11a31fcfab2 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -41,9 +41,6 @@ id_trim = /datum/id_trim/job/scientist uniform = /obj/item/clothing/under/rank/rnd/scientist suit = /obj/item/clothing/suit/toggle/labcoat/science - backpack_contents = list( - /obj/item/modular_computer/tablet/preset/science = 1, - ) belt = /obj/item/modular_computer/tablet/pda/science ears = /obj/item/radio/headset/headset_sci shoes = /obj/item/clothing/shoes/sneakers/white diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index d0b93cabf32..0c7a8f00a17 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -208,7 +208,6 @@ GLOBAL_LIST_EMPTY(security_officer_distribution) suit_store = /obj/item/gun/energy/disabler backpack_contents = list( /obj/item/evidencebag = 1, - /obj/item/modular_computer/tablet/preset/advanced/security = 1, ) belt = /obj/item/modular_computer/tablet/pda/security ears = /obj/item/radio/headset/headset_sec/alt diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index b806de25a2b..43f3670687d 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -44,9 +44,6 @@ id_trim = /datum/id_trim/job/station_engineer uniform = /obj/item/clothing/under/rank/engineering/engineer - backpack_contents = list( - /obj/item/modular_computer/tablet/preset/advanced/engineering = 1, - ) belt = /obj/item/storage/belt/utility/full/engi ears = /obj/item/radio/headset/headset_eng head = /obj/item/clothing/head/hardhat diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 7b6c3af00be..8071122f6cf 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -53,7 +53,6 @@ suit_store = /obj/item/gun/energy/disabler backpack_contents = list( /obj/item/evidencebag = 1, - /obj/item/modular_computer/tablet/preset/advanced/security = 1, ) belt = /obj/item/modular_computer/tablet/pda/warden ears = /obj/item/radio/headset/headset_sec/alt diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm index d66640aee34..0def63ff782 100644 --- a/code/modules/modular_computers/computers/item/tablet.dm +++ b/code/modules/modular_computers/computers/item/tablet.dm @@ -59,6 +59,12 @@ inserted_item = W playsound(src, 'sound/machines/pda_button1.ogg', 50, TRUE) + if(istype(W, /obj/item/paper)) + var/obj/item/paper/paper = W + + to_chat(user, span_notice("You scan \the [W] into \the [src].")) + note = paper.info + /obj/item/modular_computer/tablet/AltClick(mob/user) . = ..() if(.) diff --git a/code/modules/modular_computers/hardware/job_disk.dm b/code/modules/modular_computers/hardware/job_disk.dm index 0593ea29ee0..529fdab68d2 100644 --- a/code/modules/modular_computers/hardware/job_disk.dm +++ b/code/modules/modular_computers/hardware/job_disk.dm @@ -68,6 +68,9 @@ if(disk_flags & DISK_STATUS) progs_to_store += new /datum/computer_file/program/status(src) + if(disk_flags & DISK_SCI) + progs_to_store += new /datum/computer_file/program/science(src) + for (var/datum/computer_file/program/prog in progs_to_store) prog.usage_flags = PROGRAM_ALL prog.required_access = list() @@ -184,12 +187,12 @@ /obj/item/computer_hardware/hard_drive/role/head name = "\improper Easy-Record DELUXE disk" icon_state = "datadisk7" - disk_flags = DISK_MANIFEST | DISK_STATUS | DISK_BUDGET + disk_flags = DISK_MANIFEST | DISK_STATUS | DISK_BUDGET | DISK_SCI /obj/item/computer_hardware/hard_drive/role/hop name = "\improper HumanResources9001 disk" icon_state = "datadisk7" - disk_flags = DISK_MANIFEST | DISK_STATUS | DISK_JANI | DISK_SEC | DISK_NEWS | DISK_CARGO | DISK_ROBOS | DISK_BUDGET + disk_flags = DISK_MANIFEST | DISK_STATUS | DISK_JANI | DISK_SEC | DISK_NEWS | DISK_CARGO | DISK_ROBOS | DISK_BUDGET | DISK_SCI bot_access = list( MULE_BOT, CLEAN_BOT, @@ -199,7 +202,7 @@ /obj/item/computer_hardware/hard_drive/role/hos name = "\improper R.O.B.U.S.T. DELUXE disk" icon_state = "datadisk7" - disk_flags = DISK_MANIFEST | DISK_STATUS | DISK_SEC | DISK_ROBOS | DISK_BUDGET + disk_flags = DISK_MANIFEST | DISK_STATUS | DISK_SEC | DISK_ROBOS | DISK_BUDGET | DISK_SCI bot_access = list( SEC_BOT, ADVANCED_SEC_BOT, @@ -209,7 +212,7 @@ /obj/item/computer_hardware/hard_drive/role/ce name = "\improper Power-On DELUXE disk" icon_state = "datadisk7" - disk_flags = DISK_POWER | DISK_ATMOS | DISK_MANIFEST | DISK_STATUS | DISK_ROBOS | DISK_BUDGET + disk_flags = DISK_POWER | DISK_ATMOS | DISK_MANIFEST | DISK_STATUS | DISK_ROBOS | DISK_BUDGET | DISK_SCI bot_access = list( FLOOR_BOT, FIRE_BOT, @@ -218,7 +221,7 @@ /obj/item/computer_hardware/hard_drive/role/cmo name = "\improper Med-U DELUXE disk" icon_state = "datadisk7" - disk_flags = DISK_MANIFEST | DISK_STATUS | DISK_CHEM | DISK_ROBOS | DISK_BUDGET + disk_flags = DISK_MANIFEST | DISK_STATUS | DISK_CHEM | DISK_ROBOS | DISK_BUDGET | DISK_SCI bot_access = list( MED_BOT, ) @@ -226,7 +229,7 @@ /obj/item/computer_hardware/hard_drive/role/rd name = "\improper Signal Ace DELUXE disk" icon_state = "rndmajordisk" - disk_flags = DISK_ATMOS | DISK_MANIFEST | DISK_STATUS | DISK_CHEM | DISK_ROBOS | DISK_BUDGET | DISK_SIGNAL + disk_flags = DISK_ATMOS | DISK_MANIFEST | DISK_STATUS | DISK_CHEM | DISK_ROBOS | DISK_BUDGET | DISK_SIGNAL | DISK_SCI bot_access = list( FLOOR_BOT, CLEAN_BOT,