From 9cfab079af9057d57f530ce135413e0b67351285 Mon Sep 17 00:00:00 2001 From: Waterpig Date: Fri, 31 Mar 2023 14:51:07 +0200 Subject: [PATCH 1/3] Update grown.dm --- code/modules/hydroponics/grown.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 7230256a1abb..bfa4706ea75c 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -107,6 +107,8 @@ // Various gene procs /obj/item/reagent_containers/food/snacks/grown/attack_self(mob/user) if(seed && seed.get_gene(/datum/plant_gene/trait/squash)) + to_chat(user, span_notice("You start squashing the [src]")) + do_after(user, 2 SECONDS, src) squash(user) ..() From 2c42342b775e35b6a7c9815435bac49348a421bf Mon Sep 17 00:00:00 2001 From: Waterpig Date: Fri, 31 Mar 2023 15:40:51 +0200 Subject: [PATCH 2/3] Update grown.dm --- code/modules/hydroponics/grown.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index bfa4706ea75c..b15bb28badb2 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -107,8 +107,9 @@ // Various gene procs /obj/item/reagent_containers/food/snacks/grown/attack_self(mob/user) if(seed && seed.get_gene(/datum/plant_gene/trait/squash)) - to_chat(user, span_notice("You start squashing the [src]")) - do_after(user, 2 SECONDS, src) + if(seed.get_gene(/datum/plant_gene/trait/teleport)) + to_chat(user, span_notice("You start squashing the [src]")) + do_after(user, 2 SECONDS, src) squash(user) ..() From 6c2024b2efc31cc45c102c03e4d9a8437f2167d6 Mon Sep 17 00:00:00 2001 From: Waterpig Date: Fri, 31 Mar 2023 15:54:23 +0200 Subject: [PATCH 3/3] Fixes my immense idiocy --- code/modules/hydroponics/grown.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index b15bb28badb2..e13a9c7acc3f 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -109,7 +109,9 @@ if(seed && seed.get_gene(/datum/plant_gene/trait/squash)) if(seed.get_gene(/datum/plant_gene/trait/teleport)) to_chat(user, span_notice("You start squashing the [src]")) - do_after(user, 2 SECONDS, src) + if(do_after(user, 2 SECONDS, src)) + squash(user) + return ..() squash(user) ..()