From c51838547927284f144059663a958dfd9a82965c Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 21 Jan 2023 22:34:21 +1100 Subject: [PATCH] Removed owner reference from drake equipment population. --- .../sif/grafadreka/grafadreka_harness.dm | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka_harness.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka_harness.dm index e0cef6e728..8f2c7a92af 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka_harness.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka_harness.dm @@ -24,39 +24,34 @@ /obj/item/flashlight = ATTACHED_LIGHT ) - /// The drake that owns this harness. - var/mob/living/simple_mob/animal/sif/grafadreka/trained/owner - - /obj/item/storage/internal/animal_harness/grafadreka/Destroy() attachable_types = null - owner = null return ..() /obj/item/storage/internal/animal_harness/grafadreka/Initialize(mapload) attachable_types = grafadreka_attachable_types . = ..() - owner = loc - if (!istype(owner)) - log_debug("Drake harness created without a drake!") - return INITIALIZE_HINT_QDEL /obj/item/storage/internal/animal_harness/grafadreka/proc/UpdateArmor() - if (!owner) + var/mob/living/simple_mob/animal/sif/grafadreka/drake = loc + if (!istype(drake)) return var/obj/item/clothing/accessory/armor = attached_items[ATTACHED_ARMOR] if (!armor) - owner.armor = owner.original_armor + drake.armor = drake.original_armor return for (var/key in armor.armor) - armor[key] = max(owner.original_armor[key], armor.armor[key]) + armor[key] = max(drake.original_armor[key], armor.armor[key]) // Basic trained drake harness contents on spawn /obj/item/storage/internal/animal_harness/grafadreka/trained/CreateAttachments() - attached_items[ATTACHED_RADIO] = new /obj/item/radio (owner) + var/mob/living/owner = loc + if (!istype(owner)) + return + attached_items[ATTACHED_RADIO] = new /obj/item/radio(owner) new /obj/item/stack/medical/bruise_pack (src) new /obj/item/stack/medical/ointment (src) var/obj/item/storage/mre/mre_type = pick(typesof(/obj/item/storage/mre) - list( @@ -69,6 +64,9 @@ // Station/Science drake harness contents on spawn /obj/item/storage/internal/animal_harness/grafadreka/expedition/CreateAttachments() + var/mob/living/owner = loc + if (!istype(owner)) + return attached_items[ATTACHED_RADIO] = new /obj/item/radio (owner) new /obj/item/stack/medical/bruise_pack (src) new /obj/item/stack/medical/ointment (src)