From cfca867cf8a975d4ba98000afadd81ced8486b1f Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Fri, 13 May 2022 10:57:46 -0400 Subject: [PATCH] Fixes the captain's PDA (#66908) I screwed it up and didn't make the Captain's PDA a subtype of heads, so captain was spawning with the wrong PDA. --- code/__DEFINES/access.dm | 2 +- .../structures/crates_lockers/closets/secure/security.dm | 1 + code/modules/jobs/job_types/captain.dm | 2 +- .../modular_computers/computers/item/role_tablet_presets.dm | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 3e39f21b400..dd4ee1d9341 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -490,7 +490,7 @@ /obj/item/modular_computer/tablet/pda/heads/cmo = list(REGION_COMMAND), \ /obj/item/modular_computer/tablet/pda/heads/ce = list(REGION_COMMAND), \ /obj/item/modular_computer/tablet/pda/heads/rd = list(REGION_COMMAND), \ - /obj/item/modular_computer/tablet/pda/captain = list(REGION_COMMAND), \ + /obj/item/modular_computer/tablet/pda/heads/captain = list(REGION_COMMAND), \ /obj/item/modular_computer/tablet/pda/cargo = list(REGION_SUPPLY), \ /obj/item/modular_computer/tablet/pda/quartermaster = list(REGION_SUPPLY), \ /obj/item/modular_computer/tablet/pda/shaftminer = list(REGION_SUPPLY), \ diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 7c9a5ef8cf0..22a29ce7c0b 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -12,6 +12,7 @@ new /obj/item/clothing/neck/petcollar(src) new /obj/item/pet_carrier(src) new /obj/item/storage/bag/garment/captain(src) + new /obj/item/computer_hardware/hard_drive/portable/command/captain(src) new /obj/item/storage/box/silver_ids(src) new /obj/item/radio/headset/heads/captain/alt(src) new /obj/item/radio/headset/heads/captain(src) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 907608d2255..8173dc99434 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -62,7 +62,7 @@ /obj/item/melee/baton/telescopic = 1, /obj/item/station_charter = 1, ) - belt = /obj/item/modular_computer/tablet/pda/captain + belt = /obj/item/modular_computer/tablet/pda/heads/captain ears = /obj/item/radio/headset/heads/captain/alt glasses = /obj/item/clothing/glasses/sunglasses gloves = /obj/item/clothing/gloves/color/captain 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 e361dd02277..cff4cd7847f 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -23,7 +23,7 @@ greyscale_colors = "#2C7CB2#FF0000#FFFFFF#FFD55B" insert_type = /obj/item/pen/fountain -/obj/item/modular_computer/tablet/pda/captain/Initialize(mapload) +/obj/item/modular_computer/tablet/pda/heads/captain/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_TABLET_CHECK_DETONATE, .proc/tab_no_detonate)