Merge pull request #8164 from Poojawa/vore-mechanic-fixes

[Ready] Vore interactions, feeding, UI cleanup!

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

@@ -5,6 +5,9 @@
 	var/lastdirchange
 	var/combatmessagecooldown
 
+	//oh no vore time
+	var/voremode = FALSE
+
 /mob/living/carbon/CanPass(atom/movable/mover, turf/target)
 	. = ..()
 	if(.)
@@ -19,6 +22,8 @@
 	if(recoveringstam)
 		return TRUE
 	combatmode = !combatmode
+	if(voremode)
+		toggle_vore_mode()
 	if(combatmode)
 		playsound_local(src, 'modular_citadel/sound/misc/ui_toggle.ogg', 50, FALSE, pressure_affected = FALSE) //Sound from interbay!
 	else
@@ -34,6 +39,16 @@
 	SEND_SIGNAL(src, COMSIG_COMBAT_TOGGLED, src, combatmode)
 	return TRUE
 
+mob/living/carbon/proc/toggle_vore_mode()
+	voremode = !voremode
+	if(hud_used && hud_used.static_inventory)
+		for(var/obj/screen/voretoggle/selector in hud_used.static_inventory)
+			selector.rebaseintomygut(src)
+	if(combatmode)
+		return FALSE //let's not override the main draw of the game these days
+	SEND_SIGNAL(src, COMSIG_VORE_TOGGLED, src, voremode)
+	return TRUE
+
 /mob/living/carbon/Move(atom/newloc, direct = 0)
 	var/currentdirection = dir
 	. = ..()

modular_citadel/code/modules/mob/living/carbon/human/human_defense.dm

@@ -1,9 +1,3 @@
-/mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
-	if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && isliving(pulling))
-		vore_attack(user, pulling)
-	else
-		..()
-
 /mob/living/carbon/human/alt_attack_hand(mob/user)
 	if(..())
 		return

modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm

@@ -233,3 +233,5 @@
 
 /mob/living/carbon/human/vore
 	devourable = TRUE
+	digestable = TRUE
+	feeding = TRUE