Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds the ability to pick up paper bins and stops fires consuming more wood when they're full #4616

Merged
merged 3 commits into from
Oct 10, 2023
Merged

Adds the ability to pick up paper bins and stops fires consuming more wood when they're full #4616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aec6d0f
fixes campfire fuel bug
Oct 9, 2023
a70499f
allows picking up paper bins
Oct 9, 2023
2b79e93
forgot usr
Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/game/objects/structures/props.dm
View file
Open in desktop
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
View file
Open in desktop
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