fixes the mopbucket not taking mops (#20013)

This commit is contained in:
GDN
2023-01-06 21:57:19 +01:00
committed by GitHub
parent 61eefd625e
commit 1a5ce03ec3
2 changed files with 11 additions and 2 deletions
+6 -1
View File
@@ -27,7 +27,9 @@
/obj/item/mop/proc/wet_mop(obj/o, mob/user)
if(o.reagents.total_volume < 1)
to_chat(user, "[o] is out of water!</span>")
if(!istype(o, /obj/item/reagent_containers/glass/bucket))
if(istype(o, /obj/structure/mopbucket))
mopbucket_insert(user, o)
if(istype(o, /obj/structure/janitorialcart))
janicart_insert(user, o)
return
@@ -119,3 +121,6 @@
/obj/item/mop/advanced/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
return
/obj/item/mop/advanced/cyborg/mopbucket_insert(mob/user, obj/structure/mopbucket/J)
return
+5 -1
View File
@@ -34,7 +34,7 @@
M.wet_mop(src, user)
return
if(!stored_mop)
M.janicart_insert(user, src)
M.mopbucket_insert(user, src)
return
to_chat(user, "<span class='notice'>Theres already a mop in the mopbucket.</span>")
return
@@ -46,6 +46,10 @@
to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
return
/obj/item/mop/proc/mopbucket_insert(mob/user, obj/structure/mopbucket/J)
J.stored_mop = src
J.put_in_cart(src, user)
/obj/structure/mopbucket/on_reagent_change()
update_icon(UPDATE_OVERLAYS)