Make combat mode actually override the VM icon

modular_citadel/code/_onclick/hud/screen_objects.dm

@@ -61,7 +61,7 @@
 /obj/screen/voretoggle/proc/rebaseintomygut(mob/living/carbon/C)
 	if(!C)
 		return
-	if(C.voremode)
+	if(C.voremode && !C.combatmode)
 		icon_state = "nom"
 	else
 		icon_state = "nom_off"

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

@@ -40,12 +40,12 @@
 	return TRUE
 
 mob/living/carbon/proc/toggle_vore_mode()
-	if(combatmode)
-		return FALSE //let's not override the main draw of the game these days
 	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