cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 17:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

You can now sweep into janicarts trash bags (#20629)

Browse Source 
* You can now sweep into janicarts trash bags

* farie review

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
Henri215
2023-03-25 09:38:49 -03:00
committed by GitHub
parent 996756dd01
commit c596e415de
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/twohanded.dm
+13 -5
View File
@@ -1004,22 +1004,30 @@
return
var/turf/new_item_loc = get_step(current_item_loc, user.dir)
var/obj/machinery/disposal/target_bin = locate(/obj/machinery/disposal) in new_item_loc.contents
var/obj/structure/janitorialcart/jani_cart = locate(/obj/structure/janitorialcart) in new_item_loc.contents
var/obj/vehicle/janicart/jani_vehicle = locate(/obj/vehicle/janicart) in new_item_loc.contents
var/trash_amount = 1
for(var/obj/item/garbage in current_item_loc.contents)
if(!garbage.anchored)
if(target_bin)
garbage.forceMove(target_bin)
if(jani_vehicle?.mybag && garbage.w_class <= WEIGHT_CLASS_SMALL)
move_into_storage(user, jani_vehicle.mybag, garbage)
else if(jani_cart?.mybag && garbage.w_class <= WEIGHT_CLASS_SMALL)
move_into_storage(user, jani_cart.mybag, garbage)
else if(target_bin)
move_into_storage(user, target_bin, garbage)
else
garbage.Move(new_item_loc, user.dir)
trash_amount++
if(trash_amount > BROOM_PUSH_LIMIT)
break
if(trash_amount > 1)
if(target_bin)
target_bin.update_icon()
to_chat(user, "<span class='notice'>You sweep the pile of garbage into [target_bin].</span>")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 10, TRUE, -1)
/obj/item/twohanded/push_broom/proc/move_into_storage(mob/user, obj/storage, obj/trash)
trash.forceMove(storage)
storage.update_icon()
to_chat(user, "<span class='notice'>You sweep the pile of garbage into [storage].</span>")
/obj/item/twohanded/push_broom/proc/janicart_insert(mob/user, obj/structure/janitorialcart/cart)
cart.mybroom = src
cart.put_in_cart(src, user)