Merge remote-tracking branch 'refs/remotes/VOREStation/master'

# Conflicts:
#	icons/mob/human_races/markings_vr.dmi

code/modules/mob/living/simple_animal/vore/carp.dm

@@ -1,11 +1,11 @@
-/mob/living/simple_animal/hostile/carp/large
+/mob/living/simple_animal/hostile/carp/large/huge
 	name = "great white carp"
 	desc = "You're going to need a bigger ship."
 	icon = 'icons/mob/vore64x64.dmi'
 	icon_dead = "megacarp-dead"
 	icon_living = "megacarp"
 	icon_state = "megacarp"
-
+	
 	maxHealth = 600 // Boss
 	health = 600
 	speed = 3
@@ -18,14 +18,13 @@
 	old_y = -16
 	pixel_x = -16
 	pixel_y = -16
-
-/mob/living/simple_animal/hostile/carp/large/huge
-	icon = 'icons/mob/vore64x64.dmi'
+	vore_capacity = 2
 
 // Activate Noms!
 /mob/living/simple_animal/hostile/carp/large
+	icon = 'icons/mob/vore64x64.dmi'
 	vore_active = 1
 	vore_pounce_chance = 50
-	vore_capacity = 2
+	vore_capacity = 1
 	vore_max_size = RESIZE_HUGE
 	vore_icons = SA_ICON_LIVING

code/modules/mob/living/simple_animal/vore/zz_vore_overrides.dm

@@ -74,6 +74,12 @@
 	vore_capacity = 3
 	vore_pounce_chance = 75
 
+/mob/living/simple_animal/hostile/alien/sentinel/praetorian
+	icon = 'icons/mob/vore64x64.dmi'
+
+/mob/living/simple_animal/hostile/alien/queen/empress/mother
+	vore_icons = 0 // NO VORE SPRITES
+
 /mob/living/simple_animal/hostile/bear
 	vore_active = 1
 	icon = 'icons/mob/vore.dmi'

code/modules/mob/new_player/sprite_accessories_vr.dm

@@ -198,6 +198,49 @@
 		icon_state = "hair_messy"
 		species_allowed = list("Tajara", "Xenochimera")
 
+//Teshari things
+	teshari
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_altdefault
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_tight
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_excited
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_spike
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_long
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_burst
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_shortburst
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_mohawk
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_pointy
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_upright
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_mane
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_droopy
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+	teshari_mushroom
+		icon_add = 'icons/mob/human_face_vr_add.dmi'
+
 //Skrell 'hairstyles' - these were requested for a chimera and screw it, if one wants to eat seafood, go nuts
 	skr_tentacle_veryshort
 		name = "Skrell Very Short Tentacles"
@@ -498,6 +541,12 @@
 		color_blend_mode = ICON_MULTIPLY
 		body_parts = list(BP_HEAD)
 
+	snoutstripe
+		name = "snout stripe (Vulp)"
+		icon_state = "snoutstripe"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_HEAD)
+
 	vulp_face
 		name = "face (Vulp)"
 		icon_state = "vulp_face"
@@ -540,6 +589,11 @@
 		icon_state = "spidereyes"
 		body_parts = list(BP_HEAD)
 
+	sergaleyes
+		name = "Sergal Eyes"
+		icon_state = "eyes_sergal"
+		body_parts = list(BP_HEAD)
+
 	nevrean_female
 		name = "Female Nevrean beak"
 		icon_state = "nevrean_f"