From c7502996f4bef0429b96a12e3f1471e7e5ffb376 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Fri, 22 May 2020 20:55:32 -0400
Subject: [PATCH] Merge upstream PR

---
 code/game/objects/objs.dm                | 3 ---
 code/game/objects/structures/janicart.dm | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 94c45e502e6..3764ae62587 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -201,12 +201,9 @@
 /obj/proc/is_safe_to_step(mob/living/L)
 	return TRUE
 
-<<<<<<< HEAD
 /obj/proc/container_resist(var/mob/living)
 	return
 
-=======
->>>>>>> 656cbe7... Merge pull request #7190 from VOREStation/Arokha/janicart
 //To be called from things that spill objects on the floor.
 //Makes an object move around randomly for a couple of tiles
 /obj/proc/tumble(var/dist = 2)
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index e0c86d5371e..d14efeea5b5 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -57,11 +57,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
 				else
 					mybucket.reagents.trans_to_obj(I, 5)	//
 					to_chat(user, "<span class='notice'>You wet [I] in [mybucket].</span>")
-<<<<<<< HEAD
 					playsound(src, 'sound/effects/slosh.ogg', 25, 1)
-=======
-					playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
->>>>>>> 656cbe7... Merge pull request #7190 from VOREStation/Arokha/janicart
 			else
 				to_chat(user, "<span class='notice'>[I] can't absorb anymore liquid!</span>")
 		else