From 43b526db71a9c1a47dfa807f87e41a74ed54fc48 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 28 Aug 2022 19:20:17 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../human/species/station/station_special_abilities_vr.dm      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
index 126491bdff..1a7f06be8f 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
@@ -1065,8 +1065,6 @@
 		C.update_transform()
 		//egg_contents -= src
 		C.contents -= src
-<<<<<<< HEAD
-=======
 
 /mob/living/carbon/human/proc/water_stealth()
 	set name = "Dive under water / Resurface"
@@ -1155,4 +1153,3 @@
 			"<span class='danger'>You are dragged below the water and feel yourself slipping directly into \the [src]'s [vore_selected]!</span>")
 		to_chat(src, "<span class='notice'>You successfully drag \the [target] into the water, slipping them into your [vore_selected].</span>")
 		target.forceMove(src.vore_selected)
->>>>>>> df05951dd6... Merge pull request #13573 from Cameron653/AQUATIC_LIFE