From be60f7e039c80ce229e8f1ac3dcaa792a90af40e Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 5 Dec 2021 13:07:11 -0500
Subject: [PATCH] powder that makes you say yes

---
 code/modules/resleeving/machines.dm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm
index 9925a962f9..d95c72f02a 100644
--- a/code/modules/resleeving/machines.dm
+++ b/code/modules/resleeving/machines.dm
@@ -616,9 +616,8 @@
 
 	occupant.confused = max(occupant.confused, confuse_amount)
 	occupant.eye_blurry = max(occupant.eye_blurry, blur_amount)
-<<<<<<< HEAD
-=======
 
+/* // CHOMPstation removal
 	// Vore deaths get a fake modifier labeled as such
 	if(!occupant.mind)
 		log_debug("[occupant] didn't have a mind to check for vore_death, which may be problematic.")
@@ -629,7 +628,7 @@
 	// Normal ones get a normal modifier to nerf charging into combat
 	else
 		occupant.add_modifier(/datum/modifier/resleeving_sickness, sickness_duration)
->>>>>>> 19b662e943... Merge pull request #11939 from Heroman3003/nmensayfix
+*/ // CHOMPedit end
 
 	if(occupant.mind && occupant.original_player && ckey(occupant.mind.key) != occupant.original_player)
 		log_and_message_admins("is now a cross-sleeved character. Body originally belonged to [occupant.real_name]. Mind is now [occupant.mind.name].",occupant)