mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Merge pull request #5631 from CHOMPStation2/upstream-merge-14411
[MIRROR] Fixes #14409
This commit is contained in:
@@ -38,7 +38,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
|
|||||||
to_chat(user, "<span class='warning'>There's no room in [src] for [I].</span>")
|
to_chat(user, "<span class='warning'>There's no room in [src] for [I].</span>")
|
||||||
return FALSE
|
return FALSE
|
||||||
|
|
||||||
if(!user.unEquip(I, 0, src))
|
if(!user.canUnEquip(I))
|
||||||
to_chat(user, "<span class='warning'>[I] is stuck to your hand.</span>")
|
to_chat(user, "<span class='warning'>[I] is stuck to your hand.</span>")
|
||||||
return FALSE
|
return FALSE
|
||||||
|
|
||||||
@@ -83,6 +83,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
|
|||||||
to_chat(user, "<span class='warning'>There's no room in [src] for [I].</span>")
|
to_chat(user, "<span class='warning'>There's no room in [src] for [I].</span>")
|
||||||
return FALSE
|
return FALSE
|
||||||
|
|
||||||
|
user.drop_from_inventory(I, src)
|
||||||
update_icon()
|
update_icon()
|
||||||
to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
|
to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
|
||||||
return TRUE
|
return TRUE
|
||||||
|
|||||||
Reference in New Issue
Block a user