Random Fixes + Dildos (#268)

* I'LL SNEAK THIS IN, TOO

* will it blend

* event tweaking

* new kinkmate sprite

* savefile bugfixes

* drinks got overwritten again

rip

* replaces missing styles

* dildos

* last bit

code/citadel/organs/eggsack.dm

@@ -5,6 +5,7 @@
 	icon 			= 'code/citadel/icons/ovipositor.dmi'
 	zone 			= "groin"
 	slot 			= "testicles"
+	color			= null //don't use the /genital color since it already is colored
 	w_class 		= 3
 	var/internal = TRUE
 	var/egg_girth = EGG_GIRTH_DEF

code/citadel/organs/genitals.dm

@@ -12,25 +12,31 @@
 	var/fluid_mult = 1
 	var/producing = FALSE
 
-/obj/item/organ/genital/New()
+/obj/item/organ/genital/Initialize()
 	..()
 	reagents = create_reagents(fluid_max_volume)
 
+/obj/item/organ/genital/Destroy()
+	if(owner)
+		Remove(owner, 1)//this should remove references to it, so it can be GCd correctly
+	update_link()
+	return ..()
+
 /obj/item/organ/genital/proc/update()
-	return
+	update_size()
+	update_appearance()
+	update_link()
 
 /obj/item/organ/genital/proc/update_size()
-	return
 
 /obj/item/organ/genital/proc/update_appearance()
-	return
 
 /obj/item/organ/genital/proc/update_link()
 
-
 /obj/item/organ/genital/Insert(mob/living/carbon/M, special = 0)
 	..()
 	update()
+
 /obj/item/organ/genital/Remove(mob/living/carbon/M, special = 0)
 	..()
 	update()
@@ -40,7 +46,6 @@
 	if(clean)
 		var/obj/item/organ/genital/GtoClean
 		for(GtoClean in internal_organs)
-			GtoClean.Remove(src)
 			qdel(GtoClean)
 	if(dna.features["has_cock"])
 		give_penis()
@@ -69,7 +74,7 @@
 			if(dna.species.use_skintones && dna.features["genitals_use_skintone"])
 				P.color = skintone2hex(skin_tone)
 			else
-				P.color = dna.features["cock_color"]
+				P.color = "#[dna.features["cock_color"]]"
 			P.length = dna.features["cock_length"]
 			P.girth_ratio = dna.features["cock_girth_ratio"]
 			P.shape = dna.features["cock_shape"]
@@ -83,10 +88,10 @@
 	if(!getorganslot("testicles"))
 		var/obj/item/organ/genital/testicles/T = new
 		T.Insert(src)
-		if(dna.species.use_skintones && dna.features["genitals_use_skintone"])
-			T.color = skintone2hex(skin_tone)
-		else
-			T.color = dna.features["balls_color"]
+//		if(dna.species.use_skintones && dna.features["genitals_use_skintone"])
+//			T.color = skintone2hex(skin_tone)
+//		else
+//			T.color = "#[dna.features["balls_color"]]"
 		T.size = dna.features["bals_size"]
 		T.sack_size = dna.features["balls_sack_size"]
 		T.fluid_id = dna.features["balls_fluid"]

code/citadel/organs/penis.dm

@@ -6,7 +6,6 @@
 	zone 		= "groin"
 	slot 		= "penis"
 	w_class 	= 3
-	color 		= null
 	can_masturbate_with = 1
 	size 	= 2 //arbitrary value derived from length and girth for sprites.
 	var/length 	= 6	//inches
@@ -17,8 +16,7 @@
 	var/list/knotted_types = list("", "barbknot")
 	var/obj/item/organ/genital/testicles/linked_balls
 
-/obj/item/organ/genital/penis/New()
-	..()
+/obj/item/organ/genital/penis/Initialize()
 	update()
 
 /obj/item/organ/genital/penis/update()
@@ -41,13 +39,13 @@
 	girth = (length * girth_ratio)
 
 /obj/item/organ/genital/penis/update_appearance()
-	var/string = "penis_[shape]_[size]"
+	var/string = "penis_[lowertext(shape)]_[size]"
 	icon_state = sanitize_text(string)
 //	name = "[shape] penis"
 	desc = "That's a [lowertext(shape)] penis. You estimate it's about [round(length, 0.25)] inch[length > 1 ? "es" : ""] long and [round(girth, 0.25)] inch[length > 1 ? "es" : ""] around."
 	if(!owner)
 		return
-	color = sanitize_hexcolor(owner.dna.features["cock_color"], 6, 0)
+	color = "#[owner.dna.features["cock_color"]]"
 
 /obj/item/organ/genital/penis/update_link()
 	if(owner)

code/citadel/organs/testicles.dm

@@ -14,10 +14,10 @@
 	var/sent_full_message = 1 //defaults to 1 since they're full to start
 	var/obj/item/organ/genital/penis/linked_penis
 
-/obj/item/organ/genital/testicles/New()
-	..()
+/obj/item/organ/genital/testicles/Initialize()
 	create_reagents(fluid_max_volume)
 	reagents.add_reagent(fluid_id, fluid_max_volume)
+	update()
 
 /obj/item/organ/genital/testicles/on_life()
 	if(fluid_id && producing)

code/citadel/organs/vagina.dm

@@ -1,6 +1,7 @@
 /obj/item/organ/genital/vagina
 	name 					= "vagina"
 	desc 					= "A female reproductive organ."
+	icon					= 'code/citadel/icons/vagina.dmi'
 	icon_state 				= "vagina"
 	zone 					= "groin"
 	slot 					= "vagina"