From 498aad09cbafdcb8ccc529a587b7819304befc0f Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Thu, 14 May 2015 02:07:35 -0400 Subject: [PATCH] Empty Slices Fix Fixes watermelon slices being empty. Potatoes, carrots, and watermelons will now properly transfer their reagents to the new slices when chopped/sliced, divided evenly across the total number of slices. Watermelons create 5 slices, carrots and potatoes only create 1 (since they are a plate/pile of fries/sticks). --- code/modules/hydroponics/grown.dm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 967aa49a74a..6e326718ca6 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -201,6 +201,8 @@ del(src) return else if(W.sharp) + var/reagents_per_slice + var/obj/slice if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful. user.show_message("You carve a face into [src]!", 1) new /obj/item/clothing/head/hardhat/pumpkinhead (user.loc) @@ -208,23 +210,31 @@ return else if(seed.kitchen_tag == "potato") user << "You slice \the [src] into sticks." - new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src)) + reagents_per_slice = reagents.total_volume + slice = new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src)) + reagents.trans_to(slice, reagents_per_slice) del(src) return else if(seed.kitchen_tag == "carrot") user << "You slice \the [src] into sticks." - new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src)) + reagents_per_slice = reagents.total_volume + slice = new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src)) + reagents.trans_to(slice, reagents_per_slice) del(src) return else if(seed.kitchen_tag == "watermelon") user << "You slice \the [src] into large slices." + reagents_per_slice = reagents.total_volume/5 for(var/i=0,i<5,i++) - new /obj/item/weapon/reagent_containers/food/snacks/watermelonslice(get_turf(src)) + slice = new /obj/item/weapon/reagent_containers/food/snacks/watermelonslice(get_turf(src)) + reagents.trans_to(slice, reagents_per_slice) del(src) return else if(seed.kitchen_tag == "soybeans") user << "You roughly chop up \the [src]." - new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src)) + reagents_per_slice = reagents.total_volume + slice = new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src)) + reagents.trans_to(slice, reagents_per_slice) del(src) return else if(seed.chems)