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

Fix sinks washing things at a distance

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-21 13:08:11 -04:00
parent 3237ae96d7
commit c6b4eddefb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/objects/structures/watercloset.dm
View File

@@ -387,11 +387,12 @@
playsound(src, 'sound/effects/sink_long.ogg', 75, 1) playsound(src, 'sound/effects/sink_long.ogg', 75, 1)
busy = 1 busy = 1
sleep(40) if(!do_after(user, 40, src))
busy = 0
to_chat(usr, "<span class='notice'>You stop washing your hands.</span>")
return
busy = 0 busy = 0
if(!Adjacent(user)) return //Person has moved away from the sink
user.clean_blood() user.clean_blood()
if(ishuman(user)) if(ishuman(user))
user:update_inv_gloves() user:update_inv_gloves()
@@ -443,13 +444,12 @@
to_chat(usr, "<span class='notice'>You start washing \the [I].</span>") to_chat(usr, "<span class='notice'>You start washing \the [I].</span>")
busy = 1 busy = 1
sleep(40) if(!do_after(user, 40, src))
busy = 0
to_chat(usr, "<span class='notice'>You stop washing \the [I].</span>")
return
busy = 0 busy = 0
if(user.loc != location) return //User has moved
if(!I) return //Item's been destroyed while washing
if(user.get_active_hand() != I) return //Person has switched hands or the item in their hands
O.clean_blood() O.clean_blood()
user.visible_message( \ user.visible_message( \
"<span class='notice'>[user] washes \a [I] using \the [src].</span>", \ "<span class='notice'>[user] washes \a [I] using \the [src].</span>", \