From 5275e252a5c72516074abe076d8f05834df3ad8a Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 9 Jun 2024 11:11:58 +0100 Subject: [PATCH] Firedoor PDA (#11012) * Firedoor PDA * Fixes in testing --- code/game/machinery/doors/firedoor.dm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index ea6159059d094..edf14ba9f4a3c 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -112,11 +112,6 @@ if(operating) return - if(istype(C, /obj/item/modular_computer/tablet/pda)) - var/attack_verb = pick("smushes","rubs","smashes","presses","taps") - visible_message("[user] [attack_verb] \the [C] against [src]\s card reader.", "You [attack_verb] \the [C] against [src]\s card reader. It doesn't do anything.", "You hear plastic click against metal.") - return - if(welded) if(C.tool_behaviour == TOOL_WRENCH) if(boltslocked) @@ -152,19 +147,19 @@ if(!density || welded) return - if(isidcard(I)) - if((check_safety(user) == TRUE) || check_access(I)) - log_opening(I, user, check_safety(user)) + var/obj/item/card/id/id_card = I.GetID() + if(istype(id_card)) + if((check_safety(user) == TRUE) || check_access(id_card)) + log_opening(id_card, user, check_safety(user)) playsound(src, 'sound/machines/beep.ogg', 50, 1) open() return else - log_opening(I, user, -1) + log_opening(id_card, user, -1) to_chat(user, "Access Denied, User not authorized to override alarms or pressure checks.") playsound(src, 'sound/machines/terminal_error.ogg', 50, 1) return to_chat("You try to pull the card reader. Nothing happens.") - return /obj/machinery/door/firedoor/proc/log_opening(obj/item/card/id/I, mob/user, safe) var/safestate = "UNK_STATE:"