Merge pull request #13089 from Putnam3145/fix-sprite-display

Demodularization + making certain sprite overlays less hilariously jank

code/modules/arousal/genitals.dm

@@ -232,23 +232,6 @@
 /obj/item/organ/genital/proc/get_features(mob/living/carbon/human/H)
 	return
 
-
-//procs to handle sprite overlays being applied to humans
-
-/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, hands or cuffs.
-		update_genitals()
-
-/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(!. || no_update)
-		return
-	update_genitals()
-
 /mob/living/carbon/human/proc/update_genitals()
 	if(QDELETED(src))
 		return

code/modules/mob/living/carbon/human/inventory.dm

@@ -169,7 +169,7 @@
 	//Item is handled and in slot, valid to call callback, for this proc should always be true
 	if(!not_handled)
 		I.equipped(src, slot)
-
+	update_genitals()
 	return not_handled //For future deeper overrides
 
 /mob/living/carbon/human/equipped_speed_mods()
@@ -257,6 +257,7 @@
 		s_store = null
 		if(!QDELETED(src))
 			update_inv_s_store()
+	update_genitals()
 
 /mob/living/carbon/human/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
 	if((C.flags_inv & (HIDEHAIR|HIDEFACIALHAIR)) || (initial(C.flags_inv) & (HIDEHAIR|HIDEFACIALHAIR)))