From aec6d0f64b2771e827e8a4eb6e0707da9e4308cc Mon Sep 17 00:00:00 2001 From: Lee B Date: Mon, 9 Oct 2023 12:41:53 +0100 Subject: [PATCH 1/3] fixes campfire fuel bug --- code/game/objects/structures/props.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index 3e3150040cb6..be191dbb5b5f 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++ From a70499f6fa0a5fa211e3cb370cddf485a3d1efa6 Mon Sep 17 00:00:00 2001 From: Lee B Date: Mon, 9 Oct 2023 12:44:17 +0100 Subject: [PATCH 2/3] allows picking up paper bins --- code/modules/paperwork/paperbin.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 521045a56717..4a088ec74e73 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) - + put_in_hands(src) return /obj/item/paper_bin/attack_hand(mob/user) From 2b79e93e039fd66ec0d01fbd8786f6e48fdd3415 Mon Sep 17 00:00:00 2001 From: Lee B Date: Mon, 9 Oct 2023 12:48:44 +0100 Subject: [PATCH 3/3] forgot usr --- code/modules/paperwork/paperbin.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 4a088ec74e73..eafbb3c12c8a 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -23,7 +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 - put_in_hands(src) + usr.put_in_hands(src) return /obj/item/paper_bin/attack_hand(mob/user)