From 639c07665d62dfb3aa768efa2077fee03fb64bd4 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 25 Nov 2019 02:00:03 -0800 Subject: [PATCH 1/3] Personal closets can use PDAs/tablets now --- .../crates_lockers/closets/secure/personal.dm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index e44d3c9079..0af98c22a0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -9,11 +9,22 @@ if(registered_name) to_chat(user, "The display reads, \"Owned by [registered_name]\".") -/obj/structure/closet/secure_closet/personal/check_access(obj/item/card/id/I) +/obj/structure/closet/secure_closet/personal/check_access(obj/item/I) . = ..() if(!I || !istype(I)) return - if(registered_name == I.registered_name) + if(istype(I,/obj/item/modular_computer/tablet)) + var/obj/item/modular_computer/tablet/ourTablet = I + var/obj/item/computer_hardware/card_slot/card_slot = ourTablet.all_components[MC_CARD] + if(card_slot) + return registered_name == card_slot.stored_card.registered_name || registered_name == card_slot.stored_card2.registered_name + var/obj/item/card/id/ID + if(istype(I,/obj/item/pda)) + var/obj/item/pda/ourPDA = I + ID = ourPDA.id + else if(istype(I,/obj/item/card/id)) + ID = I + if(registered_name == ID.registered_name) return TRUE /obj/structure/closet/secure_closet/personal/PopulateContents() From 1283149fb228186b01f19b25d2c82f7b8e714209 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 25 Nov 2019 22:22:16 -0800 Subject: [PATCH 2/3] also allowed wallets --- .../crates_lockers/closets/secure/personal.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 0af98c22a0..9d94d64020 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -18,14 +18,10 @@ var/obj/item/computer_hardware/card_slot/card_slot = ourTablet.all_components[MC_CARD] if(card_slot) return registered_name == card_slot.stored_card.registered_name || registered_name == card_slot.stored_card2.registered_name - var/obj/item/card/id/ID - if(istype(I,/obj/item/pda)) - var/obj/item/pda/ourPDA = I - ID = ourPDA.id - else if(istype(I,/obj/item/card/id)) - ID = I - if(registered_name == ID.registered_name) + var/obj/item/card/id/ID = I.getID() + if(ID && registered_name == ID.registered_name) return TRUE + return FALSE /obj/structure/closet/secure_closet/personal/PopulateContents() ..() From 66d1b88725f9d08a250d9ddd460aa94cf373bf8b Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 25 Nov 2019 22:23:50 -0800 Subject: [PATCH 3/3] Get --- .../structures/crates_lockers/closets/secure/personal.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 9d94d64020..c89ec35897 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -18,7 +18,7 @@ var/obj/item/computer_hardware/card_slot/card_slot = ourTablet.all_components[MC_CARD] if(card_slot) return registered_name == card_slot.stored_card.registered_name || registered_name == card_slot.stored_card2.registered_name - var/obj/item/card/id/ID = I.getID() + var/obj/item/card/id/ID = I.GetID() if(ID && registered_name == ID.registered_name) return TRUE return FALSE