From c3d20c6d8ecef5febf6bd0b1743ca5e6d7e2c611 Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Fri, 13 Oct 2017 23:18:14 +0300 Subject: [PATCH] Adds few comments so other people won't be as confused as I was. Adds examine-messages for alt-clicking. Added sounds for all the computers when inserting/ejecting IDs. --- code/game/machinery/computer/card.dm | 9 +++++++-- code/game/machinery/computer/security.dm | 11 ++++++++++- code/modules/modular_computers/hardware/card_slot.dm | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 05f0a2bcf4b..e29524ae60f 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -45,6 +45,11 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) light_color = LIGHT_COLOR_BLUE +/obj/machinery/computer/card/examine(mob/user) + ..() + if(scan || modify) + to_chat(user, "Alt-click to eject the ID card.") + /obj/machinery/computer/card/Initialize() . = ..() change_position_cooldown = CONFIG_GET(number/id_console_jobslot_delay) @@ -537,7 +542,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) scan.verb_pickup() playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) scan = null - else + else //switching the ID with the one you're holding var/obj/item/I = usr.get_active_held_item() if(istype(I, /obj/item/card/id)) if(!usr.transferItemToLoc(I,src)) @@ -557,7 +562,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) modify = null region_access = null head_subordinates = null - else + else //switching the ID with the one you're holding var/obj/item/I = usr.get_active_held_item() if(istype(I, /obj/item/card/id)) if (!usr.transferItemToLoc(I,src)) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 06ab9f367cc..3def0965d5a 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -23,6 +23,11 @@ light_color = LIGHT_COLOR_RED +/obj/machinery/computer/secure_data/examine(mob/user) + ..() + if(scan) + to_chat(user, "Alt-click to eject the ID card.") + /obj/machinery/computer/secure_data/syndie icon_keyboard = "syndie_key" @@ -41,6 +46,8 @@ return scan = O to_chat(user, "You insert [O].") + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) + updateUsrDialog() else to_chat(user, "There's already an ID card in the console.") else @@ -791,9 +798,11 @@ What a mess.*/ if(scan) usr.put_in_hands(scan) scan = null - else + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) + else //switching the ID with the one you're holding var/obj/item/I = usr.is_holding_item_of_type(/obj/item/card/id) if(I) if(!usr.transferItemToLoc(I, src)) return scan = I + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm index b08fab8465f..caebfb447b8 100644 --- a/code/modules/modular_computers/hardware/card_slot.dm +++ b/code/modules/modular_computers/hardware/card_slot.dm @@ -57,6 +57,7 @@ else stored_card2 = I to_chat(user, "You insert \the [I] into \the [src].") + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) return TRUE @@ -93,6 +94,7 @@ P.event_idremoved(1, slot) to_chat(user, "You remove the card[ejected>1 ? "s" : ""] from \the [src].") + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) return TRUE return FALSE