From 71ac8b108d2ed9e514d3cd5eb15c7d0f77f72eb9 Mon Sep 17 00:00:00 2001 From: s Date: Thu, 19 Mar 2020 13:37:59 -0400 Subject: [PATCH 1/3] maybe --- code/modules/hydroponics/fermenting_barrel.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm index d46f37d1580..aec3b232578 100644 --- a/code/modules/hydroponics/fermenting_barrel.dm +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -50,6 +50,10 @@ to_chat(user, "You place [I] into [src] to start the fermentation process.") addtimer(CALLBACK(src, .proc/makeWine, fruit), rand(80, 120) * speed_multiplier) return TRUE + var/obj/item/W = I + if(W) + if(W.is_refillable()) + return 0 //so we can refill them via their afterattack. else return ..() From 6563b57ff03966c16cef87a99a9b7a6e7ce655f5 Mon Sep 17 00:00:00 2001 From: s Date: Thu, 19 Mar 2020 15:29:26 -0400 Subject: [PATCH 2/3] skog man --- code/modules/hydroponics/fermenting_barrel.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm index aec3b232578..5d7d90bbfd3 100644 --- a/code/modules/hydroponics/fermenting_barrel.dm +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -53,7 +53,7 @@ var/obj/item/W = I if(W) if(W.is_refillable()) - return 0 //so we can refill them via their afterattack. + return FALSE //so we can refill them via their afterattack. else return ..() From 9e40d7ff51cc6dafbc8e2b5d7aa938af50525528 Mon Sep 17 00:00:00 2001 From: s Date: Wed, 25 Mar 2020 18:53:30 -0400 Subject: [PATCH 3/3] Update fermenting_barrel.dm --- code/modules/hydroponics/fermenting_barrel.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm index 5d7d90bbfd3..8d996e6b17d 100644 --- a/code/modules/hydroponics/fermenting_barrel.dm +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -50,9 +50,8 @@ to_chat(user, "You place [I] into [src] to start the fermentation process.") addtimer(CALLBACK(src, .proc/makeWine, fruit), rand(80, 120) * speed_multiplier) return TRUE - var/obj/item/W = I - if(W) - if(W.is_refillable()) + if(I) + if(I.is_refillable()) return FALSE //so we can refill them via their afterattack. else return ..()