Merge pull request #8974 from kingofkosmos/mopbucket

Mopping with just a bucket
This commit is contained in:
phil235
2015-06-06 13:18:07 +02:00
2 changed files with 18 additions and 6 deletions
+6 -1
View File
@@ -386,7 +386,7 @@
user << "<span class='notice'>You fill [RG] from [src].</span>"
return
else if(istype(O, /obj/item/weapon/melee/baton))
if(istype(O, /obj/item/weapon/melee/baton))
var/obj/item/weapon/melee/baton/B = O
if(B.bcell)
if(B.bcell.charge > 0 && B.status == 1)
@@ -404,6 +404,11 @@
"<span class='userdanger'>[user] was stunned by \his wet [O]!</span>")
return
if(istype(O, /obj/item/weapon/mop))
O.reagents.add_reagent("water", 5)
user << "<span class='notice'>You wet [O] in [src].</span>"
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
var/turf/location = user.loc
if(!isturf(location)) return