From 86e053afd26e8326dc7e4eb63477af793cf24f7c Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Wed, 11 Aug 2021 21:03:02 -0700 Subject: [PATCH 1/2] Fixes circular reference in genits --- code/modules/arousal/genitals.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index ed41cae8ce..bf6e42b33d 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -27,6 +27,12 @@ if(do_update) update() +/obj/item/organ/genital/Destroy() + if(linked_organ.linked_organ == src) + linked_organ.linked_organ = null + linked_organ = null + . = ..() + /obj/item/organ/genital/proc/set_aroused_state(new_state,cause = "manual toggle") if(!(genital_flags & GENITAL_CAN_AROUSE)) return FALSE From 370f7ea9f845a95daf9e3edce3277d928e6d9a24 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Wed, 11 Aug 2021 21:04:18 -0700 Subject: [PATCH 2/2] this can be null, so --- code/modules/arousal/genitals.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index bf6e42b33d..bfcaff7d56 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -28,7 +28,7 @@ update() /obj/item/organ/genital/Destroy() - if(linked_organ.linked_organ == src) + if(linked_organ?.linked_organ == src) linked_organ.linked_organ = null linked_organ = null . = ..()