From 58389ce08142cce9b90ff13d30bf4b392f890aee Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Tue, 10 Oct 2023 22:05:52 +0100 Subject: [PATCH] Adds the ability to pick up paper bins and stops fires consuming more 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
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: You can now pick up paper bins fix: Campfires stop consuming wood when full /:cl: --------- Co-authored-by: Lee B --- code/game/objects/structures/props.dm | 2 ++ code/modules/paperwork/paperbin.dm | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index 9eea571961f7..bd5610487ea0 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -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++ diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 521045a56717..eafbb3c12c8a 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -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)