The Update (#241)

* auto vote runtime error fix

* part 1

* adds a wolf pai sprite

modified fox sprite that doesn't make your eyes bleed

* missed a painful sprite

* part 2

* ptwhatever

* save

* conflict resolution pt1

* conflict resolution pt2

* almost done with the preferences shit

* fixes missing arousal HUD

* file rename

* even more

* keep the panic commits coming

* forgot one

* wew, gonna go make some small changes

* s o o n

* LOOC admin and player toggles

* fixed backpacks and taurs clipping on the preview

* fixed penis length saving

* typo fix

* arousal fix

* icon tuning

* final

code/modules/mob/living/carbon/damage_procs.dm

@@ -36,6 +36,8 @@
 			adjustCloneLoss(damage * hit_percent)
 		if(STAMINA)
 			adjustStaminaLoss(damage * hit_percent)
+		if(AROUSAL)
+			adjustArousalLoss(damage * hit_percent)
 	return 1
 
 

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

@@ -28,6 +28,9 @@
 
 	if (notransform)
 		return
+	//citadel code
+	if(stat != DEAD)
+		handle_arousal()
 
 	if(..()) //not dead
 		for(var/datum/mutation/human/HM in dna.mutations)

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

@@ -269,6 +269,7 @@
 			standing	+= img_eyes
 
 	//Underwear, Undershirts & Socks
+	/*This will be refactored at a later date
 	if(H.underwear)
 		var/datum/sprite_accessory/underwear/underwear = underwear_list[H.underwear]
 		if(underwear)
@@ -286,11 +287,13 @@
 		var/datum/sprite_accessory/socks/socks = socks_list[H.socks]
 		if(socks)
 			standing	+= image("icon"=socks.icon, "icon_state"="[socks.icon_state]", "layer"=-BODY_LAYER)
-
+	*/
 	if(standing.len)
 		H.overlays_standing[BODY_LAYER] = standing
 
 	H.apply_overlay(BODY_LAYER)
+	//citadel code
+	handle_genitals(H)
 	handle_mutant_bodyparts(H)
 
 /datum/species/proc/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour)
@@ -392,9 +395,9 @@
 			bodyparts_to_add -= "mam_ears"
 
 	if("taur" in mutant_bodyparts)
-		if(!H.dna.features["taur"] || H.dna.features["taur"] == "None" || !H.dna.features["mam_tail"] == "None" || !H.dna.features["mam_waggingtail"] == "None")
+		if(!H.dna.features["taur"] || H.dna.features["taur"] == "None")
 			bodyparts_to_add -= "taur"
-
+		else
 
 	//Digitigrade legs are stuck in the phantom zone between true limbs and mutant bodyparts. Mainly it just needs more agressive updating than most limbs.
 	var/update_needed = FALSE

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

@@ -265,8 +265,11 @@ There are several things that need to be remembered:
 			if(hud_used.inventory_shown)			//if the inventory is open
 				client.screen += shoes					//add it to client's screen
 		update_observer_view(shoes,1)
-		var/image/standing = shoes.build_worn_icon(state = shoes.icon_state, default_layer = SHOES_LAYER, default_icon_file = 'icons/mob/feet.dmi')
-		overlays_standing[SHOES_LAYER]	= standing
+		if("taur" in dna.species.mutant_bodyparts)
+			switch(dna.features["taur"])
+				if(!"Naga" || "None")
+					var/image/standing = shoes.build_worn_icon(state = shoes.icon_state, default_layer = SHOES_LAYER, default_icon_file = 'icons/mob/feet.dmi')
+					overlays_standing[SHOES_LAYER]	= standing
 
 	apply_overlay(SHOES_LAYER)
 

code/modules/mob/living/carbon/update_icons.dm

@@ -224,6 +224,9 @@
 /mob/living/carbon/proc/update_body_parts()
 	//CHECK FOR UPDATE
 	var/oldkey = icon_render_key
+	var/istaur = 0
+	if("taur" in dna.species.mutant_bodyparts && dna.features["taur"] != "None")
+		istaur = 1
 	icon_render_key = generate_icon_render_key()
 	if(oldkey == icon_render_key)
 		return
@@ -232,6 +235,8 @@
 
 	for(var/X in bodyparts)
 		var/obj/item/bodypart/BP = X
+		if(istaur && (istype(BP, /obj/item/bodypart/r_leg) || istype(BP, /obj/item/bodypart/l_leg)) )
+			continue
 		BP.update_limb()
 
 	//LOAD ICONS