Merge pull request #15001 from Putnam3145/fix-genital-qdel

Fixes circular reference in genitals on Destroy()
2021-08-12 16:51:43 -07:00
parent 72c5878c98 370f7ea9f8
commit c0eb0adb08
1 changed files with 6 additions and 0 deletions
@@ -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