From 6bd0b85e54bc18efe5f3cd40e1b396e825c07f76 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Thu, 3 Oct 2019 19:32:11 +0200
Subject: [PATCH] I'd rather add a redundant get_held_index_of_item(I) than
 allow it to render privates over and over again.

---
 modular_citadel/code/modules/arousal/genitals.dm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm
index 34c52fe51d..9ecf67e4b0 100644
--- a/modular_citadel/code/modules/arousal/genitals.dm
+++ b/modular_citadel/code/modules/arousal/genitals.dm
@@ -211,12 +211,15 @@
 
 /mob/living/carbon/human/equip_to_slot(obj/item/I, slot)
 	. = ..()
-	if(!. && I && slot && !(slot in GLOB.no_genitals_update_slots)) //the item was successfully equipped, and the chosen slot wasn't merely storage or hands.
+	if(!. && I && slot && !(slot in GLOB.no_genitals_update_slots)) //the item was successfully equipped, and the chosen slot wasn't merely storage, hands or cuffs.
 		update_genitals()
 
-/mob/living/carbon/human/doUnEquip(obj/item/I, force)
+/mob/living/carbon/human/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE)
+	var/no_update = FALSE
+	if(!I || I == l_store || I == r_store || I == s_store || I == handcuffed || I == legcuffed || get_held_index_of_item(I)) //stops storages, cuffs and held items from triggering it.
+		no_update = TRUE
 	. = ..()
-	if(!.)
+	if(!. || no_update)
 		return
 	update_genitals()