From f05ef9688d4de6983aa5189c867bf359880a951f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 25 Feb 2024 22:59:24 +0100 Subject: [PATCH] [MIRROR] Fixes mining cyborg ore scanner shutting off when stored. (#26615) * Fixes mining cyborg ore scanner shutting off when stored. (#81604) * Fixes mining cyborg ore scanner shutting off when stored. --------- Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com> --- code/game/objects/items/devices/scanners/t_scanner.dm | 7 ++++++- code/modules/mining/equipment/mineral_scanner.dm | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/scanners/t_scanner.dm b/code/game/objects/items/devices/scanners/t_scanner.dm index c9f1ae0fd9d..555e6cc8861 100644 --- a/code/game/objects/items/devices/scanners/t_scanner.dm +++ b/code/game/objects/items/devices/scanners/t_scanner.dm @@ -4,7 +4,6 @@ custom_price = PAYCHECK_LOWER * 0.7 icon = 'icons/obj/devices/scanner.dmi' icon_state = "t-ray0" - var/on = FALSE slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL inhand_icon_state = "electronic" @@ -12,6 +11,10 @@ lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 1.5) + /// Is this T-Ray scanner currently on? + var/on = FALSE + /// Will this T-Ray scanner shut off on de-equip? (Cyborgs only) + var/shut_off_on_unequip = TRUE /obj/item/t_scanner/suicide_act(mob/living/carbon/user) user.visible_message(span_suicide("[user] begins to emit terahertz-rays into [user.p_their()] brain with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) @@ -29,6 +32,8 @@ toggle_on() /obj/item/t_scanner/cyborg_unequip(mob/user) + if(!shut_off_on_unequip) + return if(!on) return toggle_on() diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index bf52140d6a9..53357f8e30a 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -49,6 +49,9 @@ /// The range of the scanner in tiles. var/range = 7 +/obj/item/t_scanner/adv_mining_scanner/cyborg + shut_off_on_unequip = FALSE + /obj/item/t_scanner/adv_mining_scanner/cyborg/Initialize(mapload) . = ..() toggle_on()