From 3e9f0417d8da52e9af5d0535bccbfdc7d7a07632 Mon Sep 17 00:00:00 2001 From: John Doe Date: Thu, 24 Aug 2023 18:21:30 -0700 Subject: [PATCH] can't destroy the spotter tools either --- code/game/objects/items/devices/vulture_spotter.dm | 4 ++++ code/game/objects/structures/vulture_spotter.dm | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/code/game/objects/items/devices/vulture_spotter.dm b/code/game/objects/items/devices/vulture_spotter.dm index 4b771056c4df..b89009efde7e 100644 --- a/code/game/objects/items/devices/vulture_spotter.dm +++ b/code/game/objects/items/devices/vulture_spotter.dm @@ -4,6 +4,8 @@ icon_state = "vulture_scope" item_state = "electronic" flags_atom = FPRINT|CONDUCT + unacidable = TRUE + indestructible = TRUE /// A weakref to the corresponding rifle var/datum/weakref/bound_rifle @@ -22,6 +24,8 @@ icon_state = "vulture_tripod" item_state = "electronic" flags_atom = FPRINT|CONDUCT + unacidable = TRUE + indestructible = TRUE /obj/item/device/vulture_spotter_tripod/get_examine_text(mob/user) . = ..() diff --git a/code/game/objects/structures/vulture_spotter.dm b/code/game/objects/structures/vulture_spotter.dm index 01987b090d75..f5c0f09dfae2 100644 --- a/code/game/objects/structures/vulture_spotter.dm +++ b/code/game/objects/structures/vulture_spotter.dm @@ -4,6 +4,7 @@ icon_state = "vulture_tripod" density = TRUE anchored = TRUE + unacidable = TRUE /// Weakref to the associated rifle var/datum/weakref/bound_rifle /// Weakref to the scope user, if any @@ -32,6 +33,12 @@ QDEL_NULL(unscope_action) return ..() +/obj/structure/vulture_spotter_tripod/deconstruct(disassembled) + . = ..() + if(scope_attached && bound_rifle) + new /obj/item/device/vulture_spotter_scope(get_turf(src), bound_rifle) + new /obj/item/device/vulture_spotter_tripod(get_turf(src)) + /obj/structure/vulture_spotter_tripod/get_examine_text(mob/user) . = ..() if(scope_attached)