cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes NODROP mops not get stuck in mop buckets (#26250)

Browse Source 
* Cleans up the proc

* Update code/game/objects/structures/mop_bucket.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Faron review

* Proc refactor

* CI fixes

* Unnecessary check

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-07-20 16:27:53 +00:00
committed by GitHub
parent b42cbb2975
commit 6c0163747c
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/mop_bucket.dm
+19 -17
View File
@@ -23,32 +23,34 @@
GLOB.janitorial_equipment -= src
return ..()
/obj/structure/mopbucket/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/structure/mopbucket/attackby(obj/item/W, mob/user, params)
if(W.is_robot_module())
to_chat(user, "<span class='warning'>You cannot interface your modules with [src]!</span>")
return
if(istype(W, /obj/item/mop))
var/obj/item/mop/M = W
if(M.reagents.total_volume < M.reagents.maximum_volume)
M.wet_mop(src, user)
return
if(!stored_mop)
M.mopbucket_insert(user, src)
return
to_chat(user, "<span class='notice'>Theres already a mop in the mopbucket.</span>")
return
/obj/structure/mopbucket/proc/put_in_cart(obj/item/mop/I, mob/user)
user.drop_item()
if(istype(W, /obj/item/mop))
var/obj/item/mop/attacking_mop = W
if(attacking_mop.reagents.total_volume < attacking_mop.reagents.maximum_volume)
attacking_mop.wet_mop(src, user)
return
if(!user.unEquip(attacking_mop))
to_chat(user, "<span class='notice'>[attacking_mop] is stuck to your hand!</span>")
return
if(!stored_mop)
mopbucket_insert(user, attacking_mop)
return
to_chat(user, "<span class='notice'>There is already a mop in the mopbucket.</span>")
/obj/structure/mopbucket/proc/mopbucket_insert(mob/user, obj/item/mop/I)
stored_mop = I
I.forceMove(src)
to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
update_icon(UPDATE_OVERLAYS)
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)