From 8be8604d46057738898d169201bb21cdbd6fb3f6 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 14 May 2022 01:06:52 +0200 Subject: [PATCH] [MIRROR] Fixes the captain's PDA [MDB IGNORE] (#13586) * 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. * Fixes the captain's PDA Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> --- 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 aac3cd015bb..536fb2a03b7 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -496,7 +496,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 a35b4dc94af..52c47b1df3a 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 f49499c0b80..223ab8eb6f8 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)