From 32db08fe0e85d18e6549fe842445a1aafca8ee9b Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 27 Jan 2023 10:42:47 -0500
Subject: [PATCH] powder that makes you say yes

---
 .../mob/living/carbon/human/species/shadekin/shadekin.dm      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
index dccba08f48..2b8edb450f 100644
--- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
+++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
@@ -22,12 +22,10 @@
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/shadekin, /datum/unarmed_attack/bite/sharp/shadekin)
 	rarity_value = 15	//INTERDIMENSIONAL FLUFFERS
 
-<<<<<<< HEAD
 	male_scream_sound = null //CHOMPedit
 	female_scream_sound = null //CHOMPedit
-=======
+
 	inherent_verbs = list(/mob/proc/adjust_hive_range)
->>>>>>> 68f3b83a08... Merge pull request #14375 from Very-Soft/shadekinempathy
 
 	siemens_coefficient = 1
 	darksight = 10