From b76b717221a8fa66e954f261ed4d07b0e9eed021 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 21 Aug 2019 17:10:00 -0400 Subject: [PATCH] Adds compact cataloguer for Field Medics --- code/modules/catalogue/cataloguer_vr.dm | 24 ++++++++++++------- .../structures/closets/misc_vr.dm | 5 ++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/code/modules/catalogue/cataloguer_vr.dm b/code/modules/catalogue/cataloguer_vr.dm index a55feecd1ad..d1dfac5deac 100644 --- a/code/modules/catalogue/cataloguer_vr.dm +++ b/code/modules/catalogue/cataloguer_vr.dm @@ -1,20 +1,22 @@ -/obj/item/device/cataloguer/pathfinder - name = "pathfinder's cataloguer" +/obj/item/device/cataloguer/compact + name = "compact cataloguer" icon = 'icons/vore/custom_items_vr.dmi' - icon_state = "tricorder_med" + icon_state = "tricorder" action_button_name = "Toggle Cataloguer" var/deployed = TRUE + scan_range = 1 + toolspeed = 1.2 -/obj/item/device/cataloguer/pathfinder/update_icon() +/obj/item/device/cataloguer/compact/update_icon() if(busy) icon_state = "[initial(icon_state)]_s" else icon_state = initial(icon_state) -/obj/item/device/cataloguer/pathfinder/ui_action_click() +/obj/item/device/cataloguer/compact/ui_action_click() toggle() -/obj/item/device/cataloguer/pathfinder/verb/toggle() +/obj/item/device/cataloguer/compact/verb/toggle() set name = "Toggle Cataloguer" set category = "Object" @@ -35,14 +37,20 @@ var/mob/M = usr M.update_action_buttons() -/obj/item/device/cataloguer/pathfinder/afterattack(atom/target, mob/user, proximity_flag) +/obj/item/device/cataloguer/compact/afterattack(atom/target, mob/user, proximity_flag) if(!deployed) to_chat(user, span("warning", "\The [src] is closed.")) return return ..() -/obj/item/device/cataloguer/pathfinder/pulse_scan(mob/user) +/obj/item/device/cataloguer/compact/pulse_scan(mob/user) if(!deployed) to_chat(user, span("warning", "\The [src] is closed.")) return return ..() + +/obj/item/device/cataloguer/compact/pathfinder + name = "pathfinder's cataloguer" + icon_state = "tricorder_med" + scan_range = 3 + toolspeed = 1 diff --git a/maps/southern_cross/structures/closets/misc_vr.dm b/maps/southern_cross/structures/closets/misc_vr.dm index f7177109322..44a1b177975 100644 --- a/maps/southern_cross/structures/closets/misc_vr.dm +++ b/maps/southern_cross/structures/closets/misc_vr.dm @@ -61,7 +61,8 @@ /obj/item/taperoll/medical, /obj/item/device/gps/medical, /obj/item/device/geiger, - /obj/item/bodybag/cryobag) + /obj/item/bodybag/cryobag, + /obj/item/device/cataloguer/compact) /obj/structure/closet/secure_closet/pilot starts_with = list( @@ -118,7 +119,7 @@ /obj/item/clothing/accessory/holster/machete, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, - /obj/item/device/cataloguer/pathfinder) + /obj/item/device/cataloguer/compact/pathfinder) /obj/structure/closet/secure_closet/pathfinder/Initialize() if(prob(50))