From eae946fdb83c881998550de4e6ea78714ec165cb Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Mon, 11 Jul 2022 21:05:35 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/organs/organ_external.dm | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index c4f52b6a1b..48604444bf 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -1064,24 +1064,14 @@ Note that amputating the affected organ does in fact remove the infection from t
 	if((status & ORGAN_BROKEN) || cannot_break)
 		return
 
-<<<<<<< HEAD
 	if(owner)
-		//CHOMPEdit Begin
-		owner.custom_pain(pick(\
-			"<span class='danger'>You hear a loud cracking sound coming from \the [owner].</span>",\
-			"<span class='danger'>Something feels like it shattered in your [name]!</span>",\
-			"<span class='danger'>You hear a sickening crack.</span>"),brokenpain)
-		//CHOMPEdit End
-		jostle_bone()
-		if(organ_can_feel_pain() && !isbelly(owner.loc))
-=======
-	if(owner)	//VOREStation Edit Start
 		if(organ_can_feel_pain() && !isbelly(owner.loc) && !isliving(owner.loc))
-			owner.visible_message(\
+			//CHOMPEdit Begin
+			owner.custom_pain(pick(\
 				"<span class='danger'>You hear a loud cracking sound coming from \the [owner].</span>",\
 				"<span class='danger'>Something feels like it shattered in your [name]!</span>",\
-				"<span class='danger'>You hear a sickening crack.</span>")
->>>>>>> 9b7e3a34f6... Merge pull request #13294 from Very-Soft/mouseray
+				"<span class='danger'>You hear a sickening crack.</span>"),brokenpain)
+			//CHOMPEdit End
 			owner.emote("scream")
 		jostle_bone()	//VOREStation Edit End