Merge pull request #499 from TalkingCactus/let-the-bodies-hit-the-floor

Fixes Initializations

code/citadel/_cit_helpers.dm

@@ -56,11 +56,35 @@ GLOBAL_LIST_EMPTY(cock_shapes_list)//global_lists.dm for the list initialization
 GLOBAL_LIST_EMPTY(breasts_size_list)
 GLOBAL_LIST_EMPTY(breasts_shapes_list)
 GLOBAL_LIST_EMPTY(vagina_shapes_list)
-GLOBAL_LIST_INIT(cum_into_containers_list, /obj/item/weapon/reagent_containers/food/snacks/pie) //Yer fuggin snowflake name list jfc
+GLOBAL_LIST_INIT(cum_into_containers_list, list(/obj/item/weapon/reagent_containers/food/snacks/pie)) //Yer fuggin snowflake name list jfc
 GLOBAL_LIST_INIT(dick_nouns, list("dick","cock","member","shaft"))
 GLOBAL_LIST_INIT(cum_id_list,"semen")
 GLOBAL_LIST_INIT(milk_id_list,"milk")
 
+GLOBAL_LIST_INIT(dildo_shapes, list(
+		"Human"		= "human",
+		"Knotted"	= "knotted",
+		"Plain"		= "plain",
+		"Flared"	= "flared"
+		))
+GLOBAL_LIST_INIT(dildo_sizes, list(
+		"Small"		= 1,
+		"Medium"	= 2,
+		"Big"		= 3
+		))
+GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors
+		"Cyan"		= "#00f9ff",//cyan
+		"Green"		= "#49ff00",//green
+		"Pink"		= "#ff4adc",//pink
+		"Yellow"	= "#fdff00",//yellow
+		"Blue"		= "#00d2ff",//blue
+		"Lime"		= "#89ff00",//lime
+		"Black"		= "#101010",//black
+		"Red"		= "#ff0000",//red
+		"Orange"	= "#ff9a00",//orange
+		"Purple"	= "#e300ff"//purple
+		))
+
 //mentor stuff
 GLOBAL_LIST_EMPTY(mentors)
 

code/citadel/organs/breasts.dm

@@ -13,9 +13,8 @@
 	shape					= "pair"
 
 /obj/item/organ/genital/breasts/Initialize()
-	create_reagents(fluid_max_volume)
+	. = ..()
 	reagents.add_reagent(fluid_id, fluid_max_volume)
-	update()
 
 /obj/item/organ/genital/breasts/on_life()
 	if(QDELETED(src))

code/citadel/organs/genitals.dm

@@ -15,6 +15,7 @@
 	var/aroused_amount = 50 //This is a num from 0 to 100 for arousal percentage for when to use arousal state icons.
 
 /obj/item/organ/genital/Initialize()
+	. = ..()
 	reagents = create_reagents(fluid_max_volume)
 	update()
 

code/citadel/organs/penis.dm

@@ -17,9 +17,6 @@
 	var/list/knotted_types = list("knotted", "barbknot")
 	var/obj/item/organ/genital/testicles/linked_balls
 
-/obj/item/organ/genital/penis/Initialize()
-	update()
-
 /obj/item/organ/genital/penis/update_size()
 	if(length == cached_length)
 		return

code/citadel/organs/testicles.dm

@@ -15,9 +15,8 @@
 	var/obj/item/organ/genital/penis/linked_penis
 
 /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(QDELETED(src))

code/citadel/toys/dildos.dm

@@ -17,30 +17,7 @@ obj/item/weapon/dildo
 	var/random_color 	= TRUE
 	var/random_size 	= FALSE
 	var/random_shape 	= FALSE
-	//these lists are used to generate random icons, stats, and names
-	var/list/possible_colors = list(//mostly neon colors
-		"Cyan"		= "#00f9ff",//cyan
-		"Green"		= "#49ff00",//green
-		"Pink"		= "#ff4adc",//pink
-		"Yellow"	= "#fdff00",//yellow
-		"Blue"		= "#00d2ff",//blue
-		"Lime"		= "#89ff00",//lime
-		"Black"		= "#101010",//black
-		"Red"		= "#ff0000",//red
-		"Orange"	= "#ff9a00",//orange
-		"Purple"	= "#e300ff"//purple
-		)
-	var/list/possible_shapes = list(
-		"Human"		= "human",
-		"Knotted"	= "knotted",
-		"Plain"		= "plain",
-		"Flared"	= "flared"
-		)
-	var/list/possible_sizes = list(
-		"Small"		= 1,
-		"Medium"	= 2,
-		"Big"		= 3
-		)
+	//Lists moved to _cit_helpers.dm as globals so they're not instanced individually
 
 obj/item/weapon/dildo/proc/update_appearance()
 	icon_state = "[dildo_type]_[dildo_shape]_[dildo_size]"
@@ -72,22 +49,22 @@ obj/item/weapon/dildo/proc/customize(mob/living/user)
 	if(!can_customize)
 		return FALSE
 	if(src && !user.incapacitated() && in_range(user,src))
-		var/color_choice = input(user,"Choose a color for your dildo.","Dildo Color") as null|anything in possible_colors
+		var/color_choice = input(user,"Choose a color for your dildo.","Dildo Color") as null|anything in GLOB.dildo_colors
 		if(src && color_choice && !user.incapacitated() && in_range(user,src))
-			sanitize_inlist(color_choice, possible_colors, "Red")
-			color = possible_colors[color_choice]
+			sanitize_inlist(color_choice, GLOB.dildo_colors, "Red")
+			color = GLOB.dildo_colors[color_choice]
 	update_appearance()
 	if(src && !user.incapacitated() && in_range(user,src))
-		var/shape_choice = input(user,"Choose a shape for your dildo.","Dildo Shape") as null|anything in possible_shapes
+		var/shape_choice = input(user,"Choose a shape for your dildo.","Dildo Shape") as null|anything in GLOB.dildo_shapes
 		if(src && shape_choice && !user.incapacitated() && in_range(user,src))
-			sanitize_inlist(shape_choice, possible_colors, "Knotted")
-			dildo_shape = possible_shapes[shape_choice]
+			sanitize_inlist(shape_choice, GLOB.dildo_colors, "Knotted")
+			dildo_shape = GLOB.dildo_shapes[shape_choice]
 	update_appearance()
 	if(src && !user.incapacitated() && in_range(user,src))
-		var/size_choice = input(user,"Choose the size for your dildo.","Dildo Size") as null|anything in possible_sizes
+		var/size_choice = input(user,"Choose the size for your dildo.","Dildo Size") as null|anything in GLOB.dildo_sizes
 		if(src && size_choice && !user.incapacitated() && in_range(user,src))
-			sanitize_inlist(size_choice, possible_colors, "Medium")
-			dildo_size = possible_sizes[size_choice]
+			sanitize_inlist(size_choice, GLOB.dildo_colors, "Medium")
+			dildo_size = GLOB.dildo_sizes[size_choice]
 	update_appearance()
 	if(src && !user.incapacitated() && in_range(user,src))
 		var/transparency_choice = input(user,"Choose the transparency of your dildo. Lower is more transparent!(192-255)","Dildo Transparency") as null|num
@@ -98,15 +75,16 @@ obj/item/weapon/dildo/proc/customize(mob/living/user)
 	return TRUE
 
 obj/item/weapon/dildo/Initialize()
+	. = ..()
 	if(random_color == TRUE)
-		var/randcolor = pick(possible_colors)
-		color = possible_colors[randcolor]
+		var/randcolor = pick(GLOB.dildo_colors)
+		color = GLOB.dildo_colors[randcolor]
 	if(random_shape == TRUE)
-		var/randshape = pick(possible_shapes)
-		dildo_shape = possible_shapes[randshape]
+		var/randshape = pick(GLOB.dildo_shapes)
+		dildo_shape = GLOB.dildo_shapes[randshape]
 	if(random_size == TRUE)
-		var/randsize = pick(possible_sizes)
-		dildo_size = possible_sizes[randsize]
+		var/randsize = pick(GLOB.dildo_sizes)
+		dildo_size = GLOB.dildo_sizes[randsize]
 	update_appearance()
 	alpha		= rand(192, 255)
 	pixel_y 	= rand(-7,7)