Merge pull request #124 from VOREStation/heatfix

Initial Simple Fixes

code/modules/client/preference_setup/general/01_basic.dm

@@ -105,7 +105,7 @@ datum/preferences/proc/set_biological_gender(var/gender)
 		return TOPIC_REFRESH
 
 	else if(href_list["metadata"])
-		var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , pref.metadata)) as message|null
+		var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , pref.metadata) as message|null) as message|null
 		if(new_metadata && CanUseTopic(user))
 			pref.metadata = sanitize(new_metadata)
 			return TOPIC_REFRESH

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

@@ -22,7 +22,7 @@ var/datum/species/shapeshifter/promethean/prometheans
 	push_flags =       MONKEY|SLIME|SIMPLE_ANIMAL
 	flags =            NO_SCAN | NO_SLIP | NO_MINOR_CUT
 	appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | RADIATION_GLOWS
-	spawn_flags =      SPECIES_IS_RESTRICTED
+	spawn_flags =      SPECIES_IS_WHITELISTED //VOREStation Edit
 
 	breath_type = null
 	poison_type = null

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

@@ -59,17 +59,17 @@
 
 	flesh_color = "#34AF10"
 
-	reagent_tag = IS_UNATHI
+	//reagent_tag = IS_UNATHI //VOREStation Removal
 	base_color = "#066000"
 
-	heat_discomfort_level = 295
+	//heat_discomfort_level = 295 //VOREStation Removal
 	heat_discomfort_strings = list(
 		"You feel soothingly warm.",
 		"You feel the heat sink into your bones.",
 		"You feel warm enough to take a nap."
 		)
 
-	cold_discomfort_level = 292
+	//cold_discomfort_level = 292 //VOREStation Removal
 	cold_discomfort_strings = list(
 		"You feel chilly.",
 		"You feel sluggish and cold.",
@@ -122,15 +122,15 @@
 	flesh_color = "#AFA59E"
 	base_color = "#333333"
 
-	reagent_tag = IS_TAJARA
+	//reagent_tag = IS_TAJARA //VOREStation Removal
 
-	heat_discomfort_level = 292
+	//heat_discomfort_level = 292 //VOREStation Removal
 	heat_discomfort_strings = list(
 		"Your fur prickles in the heat.",
 		"You feel uncomfortably warm.",
 		"Your overheated skin itches."
 		)
-	cold_discomfort_level = 275
+	//cold_discomfort_level = 275 //VOREStation Removal
 
 /datum/species/tajaran/equip_survival_gear(var/mob/living/carbon/human/H)
 	..()
@@ -162,7 +162,7 @@
 	blood_color = "#1D2CBF"
 	base_color = "#006666"
 
-	reagent_tag = IS_SKRELL
+	//reagent_tag = IS_SKRELL //VOREStation Removal
 
 	has_limbs = list(
 		BP_TORSO =  list("path" = /obj/item/organ/external/chest),

code/modules/mob/new_player/sprite_accessories_vr.dm

@@ -5,6 +5,9 @@
 // would require us to exclude that datum from the global list.
 
 /datum/sprite_accessory/hair
+
+	species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren") //This lets all races use the default hairstyles.
+
 	sergal_plain
 		name = "Sergal Plain"
 		icon = 'icons/mob/human_face_vr.dmi'
@@ -29,8 +32,6 @@
 		icon_state = "serg_fairytail"
 		species_allowed = list("Sergal")
 
-	species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren") //This lets all races use the default hairstyles.
-
 	bald
 		name = "Bald"
 		icon_state = "bald"

code/modules/vore/appearance/update_icons_vr.dm

@@ -2,7 +2,7 @@
 #define isTaurTail(A)	istype(A, /datum/sprite_accessory/tail/taur)
 
 /mob/living/carbon/human/proc/get_ears_overlay()
-	if(ear_style && !(head && (head.flags_inv & BLOCKHEADHAIR)) && (src.species.get_bodytype() in ear_style.species_allowed))
+	if(ear_style && !(head && (head.flags_inv & BLOCKHEADHAIR)))
 		var/icon/ears_s = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.icon_state)
 		if(ear_style.do_colouration)
 			ears_s.Blend(rgb(src.r_hair, src.g_hair, src.b_hair), ear_style.color_blend_mode)

code/modules/vore/eating/belly_vr.dm

@@ -374,3 +374,4 @@
 
 	var/strsound = pick(struggle_sounds)
 	playsound(R.loc, strsound, 50, 1)
+	R << strsound //Might be too loud. We'll see.