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

---
 code/modules/mob/living/carbon/give.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm
index f53e9b70a7..e1a8120d88 100644
--- a/code/modules/mob/living/carbon/give.dm
+++ b/code/modules/mob/living/carbon/give.dm
@@ -15,16 +15,10 @@
 		to_chat(src, "<span class='warning'>You don't have anything in your hands to give to \the [target].</span>")
 		return
 
-<<<<<<< HEAD
-	if(tgui_alert(target,"[src] wants to give you \a [I]. Will you accept it?","Item Offer",list("Yes","No")) == "No") //VOREStation Edit - make yes on the left to be consistent with other dialogs
-		target.visible_message("<span class='notice'>\The [src] tried to hand \the [I] to \the [target], \
-		but \the [target] didn't want it.</span>")
-=======
 	usr.visible_message(SPAN_NOTICE("\The [usr] holds out \the [I] to \the [target]."), SPAN_NOTICE("You hold out \the [I] to \the [target], waiting for them to accept it."))
 
 	if(tgui_alert(target,"[src] wants to give you \a [I]. Will you accept it?","Item Offer",list("Yes","No")) == "No")
 		target.visible_message(SPAN_NOTICE("\The [src] tried to hand \the [I] to \the [target], but \the [target] didn't want it."))
->>>>>>> 046fef3252... Merge pull request #11922 from Heroman3003/giveswap
 		return
 
 	if(!I) return