From 5e9e417bb4e2454ae1b201a00401fed91c854e05 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 26 Jan 2017 06:23:10 -0500 Subject: [PATCH] fixing flowers --- code/modules/hydroponics/grown/flowers.dm | 6 +++--- code/modules/hydroponics/grown/nettle.dm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 1fa4810ecd2..74fc57be99c 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -177,8 +177,7 @@ force = round((5 + seed.potency / 5), 1) /obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M, mob/user) - if(!..()) - return + ..() if(isliving(M)) to_chat(M, "You are lit on fire from the intense heat of the [name]!") M.adjust_fire_stacks(seed.potency / 20) @@ -187,7 +186,8 @@ log_game("[key_name(user)] set [key_name(M)] on fire") /obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity) - if(!proximity) return + if(!proximity) + return if(force > 0) force -= rand(1, (force / 3) + 1) else diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 7e9d318093c..f6d9be51b4a 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -65,7 +65,8 @@ /obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity) - if(!proximity) return + if(!proximity) + return if(force > 0) force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off else @@ -100,8 +101,7 @@ to_chat(user, "You are stunned by the Deathnettle when you try picking it up!") /obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M, mob/user) - if(!..()) - return + ..() if(isliving(M)) to_chat(M, "You are stunned by the powerful acid of the Deathnettle!") add_logs(user, M, "attacked", src)