Merge upstream PR

This commit is contained in:
Aronai Sieyes
2020-05-22 20:55:32 -04:00
parent e7af0b2587
commit c7502996f4
2 changed files with 0 additions and 7 deletions
-4
View File
@@ -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