Skip to content

Commit

Permalink
Adds the ability to pick up paper bins and stops fires consuming more…
Browse files Browse the repository at this point in the history
… wood when they're full (#4616)

# About the pull request

Fixes #4608 
Fixes #4607 

Draft as I cannot test until home from work later today

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: You can now pick up paper bins
fix: Campfires stop consuming wood when full
/:cl:

---------

Co-authored-by: Lee B <[email protected]>
  • Loading branch information
Birdtalon and Lee B committed Oct 10, 2023
1 parent d42c007 commit 58389ce
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions code/game/objects/structures/props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,10 @@
var/obj/item/stack/sheet/wood/fuel = attacking_item
if(remaining_fuel >= initial(remaining_fuel))
to_chat(user, SPAN_NOTICE("You cannot fuel [src] further."))
return
if(!fuel.use(1))
to_chat(SPAN_NOTICE("You do not have enough [attacking_item] to fuel [src]."))
return
visible_message(SPAN_NOTICE("[user] fuels [src] with [fuel]."))
remaining_fuel++

Expand Down
3 changes: 1 addition & 2 deletions code/modules/paperwork/paperbin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
/obj/item/paper_bin/MouseDrop(atom/over_object)
if(over_object == usr && ishuman(usr) && !usr.is_mob_restrained() && !usr.stat && (loc == usr || in_range(src, usr)))
if(!usr.get_active_hand()) //if active hand is empty
attack_hand(usr, 1, 1)

usr.put_in_hands(src)
return

/obj/item/paper_bin/attack_hand(mob/user)
Expand Down

0 comments on commit 58389ce

Please sign in to comment.