cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream PR

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/objs.dm
View File

@@ -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)

4
code/game/objects/structures/janicart.dm
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