Merge branch 'master' into protean-rework

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

@@ -1,18 +1,25 @@
 /mob/living/carbon/human/update_fullness()
-    var/previous_stomach_fullness = vore_fullness_ex["stomach"]
-    var/previous_taur_fullness = vore_fullness_ex["taur belly"]
-    //update_vore_tail_sprite()
-    //update_vore_belly_sprite()
-    . = ..()
-    if(vore_fullness_ex["stomach"] != previous_stomach_fullness)
-        update_vore_belly_sprite()
-    if(vore_fullness_ex["taur belly"] != previous_taur_fullness)
-        update_vore_tail_sprite()
+	var/previous_stomach_fullness = vore_fullness_ex["stomach"]
+	var/previous_taur_fullness = vore_fullness_ex["taur belly"]
+	//update_vore_tail_sprite()
+	//update_vore_belly_sprite()
+	. = ..()
+	if(vore_fullness_ex["stomach"] != previous_stomach_fullness)
+		update_vore_belly_sprite()
+	if(vore_fullness_ex["taur belly"] != previous_taur_fullness)
+		update_vore_tail_sprite()
 
 /mob/living/carbon/human/vs_animate(var/belly_to_animate)
-    if(belly_to_animate == "stomach")
-        vore_belly_animation()
-    else if(belly_to_animate == "taur belly")
-        vore_tail_animation()
-    else
-        return
+	if(belly_to_animate == "stomach")
+		vore_belly_animation()
+	else if(belly_to_animate == "taur belly")
+		vore_tail_animation()
+	else
+		return
+
+/mob/living/carbon/human/verb/hide_headset()
+	set name = "Show/Hide Headset"
+	set category = "IC"
+	set desc = "Toggle headset worn icon visibility."
+	hide_headset = !hide_headset
+	update_inv_ears()

modular_chomp/code/modules/mob/living/carbon/human/human_defines.dm

@@ -9,3 +9,4 @@
 	vore_icon_bellies = list("stomach", "taur belly")
 	var/struggle_anim_stomach = FALSE
 	var/struggle_anim_taur = FALSE
+	var/hide_headset = FALSE

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

@@ -1,2 +1,29 @@
 /datum/species/teshari
-    vore_belly_default_variant = "T"
+    vore_belly_default_variant = "T"
+
+// allow teshari to always be scooped, as long as pref is enabled
+/mob/living/MouseDrop(var/atom/over_object)
+	// make sure src (The dragged) is human
+	if(!istype(src, /mob/living/carbon/human))
+		return ..()
+
+	var/mob/living/carbon/human/DraggedH = src
+
+	//make sure src (the dragged) is a teshari
+	if(DraggedH.species.name == SPECIES_TESHARI)
+		var/mob/living/M = over_object
+		// only perform the grab if; grabber and grabbed adjacent, caller is grabbed OR grabber, and the grabbed's grab preference is true.
+		if(holder_type && istype(M) && Adjacent(M) && (usr == M || usr == DraggedH) && DraggedH != M && !M.incapacitated() && DraggedH.pickup_pref && (M != usr || (M == usr && M.pickup_active)) && (DraggedH.a_intent == I_HELP && M.a_intent == I_HELP)) //VOREStation Edit
+			get_scooped(M, (usr == DraggedH))
+			return
+	return ..()
+
+
+//allow teshari permission to pass plastic flaps.
+/obj/structure/plasticflaps/CanPass(atom/A, turf/T)
+	var/mob/living/carbon/human/H = A
+	if(istype(H))
+		if(H.species.name == SPECIES_TESHARI)
+			return 1
+
+	return ..()

modular_chomp/code/modules/mob/mob.dm

@@ -1,6 +1,7 @@
 /mob
 	var/voice_freq = 42500	// Preference for character voice frequency
 	var/list/voice_sounds_list = list()	// The sound list containing our voice sounds!
+	var/died_in_vr = FALSE //For virtual reality sleepers
 
 /mob/is_incorporeal()
 	if(incorporeal_move)

modular_chomp/code/modules/mob/new_player/sprite_accessories_extra.dm

@@ -145,4 +145,22 @@
 	name = "Sect Drone Eyes"
 	icon_state = "sectdrone_eyes"
 	color_blend_mode = ICON_MULTIPLY
-	body_parts = list(BP_HEAD)
+	body_parts = list(BP_HEAD)
+
+/datum/sprite_accessory/marking/ch/thickneck
+	name = "Thick Neck"
+	icon_state = "thickneck"
+	body_parts = list(BP_HEAD)
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/marking/ch/thickerneck
+	name = "Thicker Neck"
+	icon_state = "thickerneck"
+	body_parts = list(BP_HEAD)
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/marking/ch/thickthroat
+	name = "Thick Throat"
+	icon_state = "thickthroat"
+	body_parts = list(BP_HEAD)
+	color_blend_mode = ICON_MULTIPLY

modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm

@@ -16,4 +16,14 @@
 	name = "Fox (Taur, 3-color)"
 	icon_state = "fox"
 	extra_overlay = "fox_markings"
-	extra_overlay2 = "fox_markings2"
+	extra_overlay2 = "fox_markings2"
+
+/datum/sprite_accessory/tail/taur/ch/sectdrone
+	name = "Sect Drone (Taur)"
+	icon_state = "sectdrone"
+	extra_overlay = "sectdrone_markings"
+
+/datum/sprite_accessory/tail/taur/ch/fatsectdrone
+	name = "Fat Sect Drone (Taur)"
+	icon_state = "fatsectdrone"
+	extra_overlay = "fatsectdrone_markings"