Merge pull request #10332 from VOREStation/Arokha/emoflip

Touch up emote port

code/modules/emotes/definitions/_mob.dm

@@ -27,6 +27,7 @@ var/list/_default_mob_emotes = list(
 
 /mob
 	var/list/usable_emotes
+	var/nextemote = 1 //VOREStation Add
 
 /mob/proc/update_emotes(var/skip_sort)
 	usable_emotes = list()

code/modules/emotes/definitions/visible_animated.dm

@@ -27,7 +27,12 @@
 
 /decl/emote/visible/flip/do_extra(mob/user)
 	. = ..()
-	if(istype(user))
+	// VOREStation Add - Fancy flips
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		H.handle_flip_vr()
+	// VOREStation Add End
+	else if(istype(user))
 		user.SpinAnimation(7,1)
 
 /decl/emote/visible/floorspin

code/modules/emotes/emote_mob.dm

@@ -1,4 +1,9 @@
 /mob/proc/can_emote(var/emote_type)
+	//VOREStation Add
+	if(src.nextemote >= world.time)
+		return FALSE
+	src.nextemote = world.time + 12
+	//VOREStation Add End
 	return (stat == CONSCIOUS)
 
 /mob/living/can_emote(var/emote_type)

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

@@ -17,7 +17,7 @@
 
 	if(losebreath>0) //Suffocating so do not take a breath
 		AdjustLosebreath(-1)
-		if (prob(10)) //Gasp per 10 ticks? Sounds about right.
+		if (prob(10) && !isbelly(loc)) //Gasp per 10 ticks? Sounds about right. //VOREStation Add
 			spawn emote("gasp")
 	else
 		//Okay, we can breathe, now check if we can get air

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

@@ -68,11 +68,12 @@ emp_act
 				msg_admin_attack("[key_name(src)] was disarmed by a stun effect")
 
 				drop_from_inventory(c_hand)
-				if (affected.robotic >= ORGAN_ROBOT)
+				if(!isbelly(loc)) //VOREStation Add
-					custom_emote(VISIBLE_MESSAGE, "drops what they were holding, their [affected.name] malfunctioning!")
+					if (affected.robotic >= ORGAN_ROBOT)
-				else
+						custom_emote(VISIBLE_MESSAGE, "drops what they were holding, their [affected.name] malfunctioning!")
-					var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
+					else
-					custom_emote(VISIBLE_MESSAGE, "[affected.organ_can_feel_pain() ? "" : emote_scream] drops what they were holding in their [affected.name]!")
+						var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
+						custom_emote(VISIBLE_MESSAGE, "[affected.organ_can_feel_pain() ? "" : emote_scream] drops what they were holding in their [affected.name]!")
 
 	..(stun_amount, agony_amount, def_zone)
 

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

@@ -163,8 +163,9 @@
 						continue
 					drop_from_inventory(r_hand)
 
-			var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
+			if(!isbelly(loc)) //VOREStation Add
-			custom_emote(VISIBLE_MESSAGE, "[(can_feel_pain()) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
+				var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
+				custom_emote(VISIBLE_MESSAGE, "[(can_feel_pain()) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
 
 		else if(E.is_malfunctioning())
 			switch(E.body_part)
@@ -177,14 +178,15 @@
 						continue
 					drop_from_inventory(r_hand)
 
-			custom_emote(VISIBLE_MESSAGE, "drops what they were holding, their [E.name] malfunctioning!")
+			if(!isbelly(loc)) //VOREStation Add
+				custom_emote(VISIBLE_MESSAGE, "drops what they were holding, their [E.name] malfunctioning!")
 
-			var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
+				var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
-			spark_system.set_up(5, 0, src)
+				spark_system.set_up(5, 0, src)
-			spark_system.attach(src)
+				spark_system.attach(src)
-			spark_system.start()
+				spark_system.start()
-			spawn(10)
+				spawn(10)
-				qdel(spark_system)
+					qdel(spark_system)
 
 //Handles chem traces
 /mob/living/carbon/human/proc/handle_trace_chems()

code/modules/reagents/reagents/dispenser.dm

@@ -423,7 +423,7 @@
 				if(affecting.take_damage(0, removed * power * 0.1))
 					H.UpdateDamageIcon()
 				if(prob(100 * removed / meltdose)) // Applies disfigurement
-					if (affecting.organ_can_feel_pain())
+					if (affecting.organ_can_feel_pain() && !isbelly(H.loc)) //VOREStation Add
 						H.emote("scream")
 					H.status_flags |= DISFIGURED
 		else