From 39d6980bab35c231c7cd4f144f5988cb0dad6dd0 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Fri, 7 Feb 2020 01:03:59 +0100
Subject: [PATCH] genitals code is so bad.

---
 .../code/modules/arousal/arousal.dm           |  6 ----
 .../code/modules/arousal/genitals.dm          | 32 ++++++++-----------
 .../code/modules/arousal/organs/breasts.dm    |  1 -
 .../code/modules/arousal/organs/penis.dm      |  2 +-
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm
index 3a586d061d..c23bef9a7d 100644
--- a/modular_citadel/code/modules/arousal/arousal.dm
+++ b/modular_citadel/code/modules/arousal/arousal.dm
@@ -10,12 +10,6 @@
 	var/hidden_undershirt = FALSE
 	var/hidden_socks = FALSE
 
-//Species vars
-/datum/species
-	var/list/cum_fluids = list("semen")
-	var/list/milk_fluids = list("milk")
-	var/list/femcum_fluids = list("femcum")
-
 //Mob procs
 /mob/living/carbon/human/proc/underwear_toggle()
 	set name = "Toggle undergarments"
diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm
index 0820a564ad..7231b536ea 100644
--- a/modular_citadel/code/modules/arousal/genitals.dm
+++ b/modular_citadel/code/modules/arousal/genitals.dm
@@ -32,23 +32,18 @@
 	else
 		update()
 
-/obj/item/organ/genital/Destroy()
-	if(linked_organ)
-		update_link(TRUE)//this should remove any other links it has
-	return ..()
-
 /obj/item/organ/genital/proc/set_aroused_state(new_state)
 	if(!((HAS_TRAIT(owner,TRAIT_PERMABONER) && !new_state) || HAS_TRAIT(owner,TRAIT_NEVERBONER) && new_state))
 		aroused_state = new_state
 	return aroused_state
 
-/obj/item/organ/genital/proc/update(removing = FALSE)
+/obj/item/organ/genital/proc/update()
 	if(QDELETED(src))
 		return
 	update_size()
 	update_appearance()
-	if(linked_organ_slot || (linked_organ && removing))
-		update_link(removing)
+	if(linked_organ_slot || (linked_organ && !owner))
+		update_link()
 
 //exposure and through-clothing code
 /mob/living/carbon
@@ -174,19 +169,18 @@
 		return TRUE
 	return FALSE
 
-/obj/item/organ/genital/proc/update_link(removing = FALSE)
-	if(!removing && owner)
+/obj/item/organ/genital/proc/update_link()
+	if(owner)
 		if(linked_organ)
-			return
+			return FALSE
 		linked_organ = owner.getorganslot(linked_organ_slot)
 		if(linked_organ)
 			linked_organ.linked_organ = src
 			linked_organ.upon_link()
 			upon_link()
 			return TRUE
-	else
-		if(linked_organ)
-			linked_organ.linked_organ = null
+	if(linked_organ)
+		linked_organ.linked_organ = null
 		linked_organ = null
 	return FALSE
 
@@ -200,10 +194,12 @@
 		update()
 		RegisterSignal(owner, COMSIG_MOB_DEATH, .proc/update_appearance)
 
-/obj/item/organ/genital/Remove(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE)
-	update(TRUE)
-	if(!QDELETED(owner))
-		UnregisterSignal(owner, COMSIG_MOB_DEATH)
+/obj/item/organ/genital/Remove(special = FALSE)
+	var/mob/living/carbon/human/H = . = ..()
+	update()
+	if(!QDELETED(H))
+		UnregisterSignal(H, COMSIG_MOB_DEATH)
+		H.update_genitals()
 
 //proc to give a player their genitals and stuff when they log in
 /mob/living/carbon/human/proc/give_genitals(clean = FALSE)//clean will remove all pre-existing genitals. proc will then give them any genitals that are enabled in their DNA
diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm
index 1537d5cebe..fa1a48b17d 100644
--- a/modular_citadel/code/modules/arousal/organs/breasts.dm
+++ b/modular_citadel/code/modules/arousal/organs/breasts.dm
@@ -63,7 +63,6 @@
 			var/mob/living/carbon/human/H = owner
 			icon_state = sanitize_text(string)
 			H.update_genitals()
-			icon_state = sanitize_text(string)
 
 //Allows breasts to grow and change size, with sprite changes too.
 //maximum wah
diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm
index c6d3c764ac..a8d1a67b19 100644
--- a/modular_citadel/code/modules/arousal/organs/penis.dm
+++ b/modular_citadel/code/modules/arousal/organs/penis.dm
@@ -14,7 +14,7 @@
 	size = 2 //arbitrary value derived from length and girth for sprites.
 	layer_index = PENIS_LAYER_INDEX
 	var/length = 6 //inches
-	var/prev_length = 6 //really should be renamed to prev_length
+	var/prev_length = 6
 	var/girth = 4.38
 	var/girth_ratio = COCK_GIRTH_RATIO_DEF //0.73; check citadel_defines.dm