From 84574a150bcfda9b437a3e46a3498214fd7bae3d Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Mon, 30 Dec 2019 21:00:25 +0800 Subject: [PATCH] weh --- code/modules/hydroponics/grown/misc.dm | 35 ++++++++++---------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 2ef59d29fe..cb70c7c48f 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -367,27 +367,18 @@ return //OPENING THE NUT LOGIC if (!carved && !chopped) - if(W.tool_behaviour == TOOL_SCREWDRIVER) - user.show_message("You make a hole in the coconut!", 1) - carved = TRUE - opened = TRUE - reagent_flags = OPENCONTAINER - ENABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER) - icon_state = "coconut_carved" - desc = "A coconut. This one's got a hole in it." - playsound(user, W.hitsound, 50, 1, -1) - return - else if(W.sharpness) - user.show_message("You slice the coconut open!", 1) - chopped = TRUE - opened = TRUE - reagent_flags = OPENCONTAINER - ENABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER) - spillable = TRUE - icon_state = "coconut_chopped" - desc = "A coconut. This one's sliced open, with all its delicious contents for your eyes to savour." - playsound(user, W.hitsound, 50, 1, -1) - return + var/screwdrivered = W.tool_behaviour == TOOL_SCREWDRIVER + if(screwdrivered || W.sharpness) + user.show_message("You [screwdrivered ? "make a hole in the coconut" : "slice the coconut open"]!", 1) + carved = TRUE + opened = TRUE + spillable = !screwdrivered + reagent_flags = OPENCONTAINER + ENABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER) + icon_state = screwdrivered ? "coconut_carved" : "coconut_chopped" + desc = "A coconut. [screwdrivered ? "This one's got a hole in it" : "This one's sliced open, with all its delicious contents for your eyes to savour"]." + playsound(user, W.hitsound, 50, 1, -1) + return return ..() /obj/item/reagent_containers/food/snacks/grown/coconut/attack(mob/living/M, mob/user, obj/target) @@ -528,4 +519,4 @@ if(!disassembled && fused) prime() if(!QDELETED(src)) - qdel(src) \ No newline at end of file + qdel(src)