From 2aadd5868091b4e9382c8524ae769fac89143a5a Mon Sep 17 00:00:00 2001 From: "d_h2005@yahoo.com" Date: Fri, 16 Nov 2012 01:08:34 +0000 Subject: [PATCH] Removes duplicate watermelon define. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5082 316c924e-a436-60f5-8080-3fe189b3f50e --- .../reagent_containers/food/snacks/grown.dm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index 63657cba7a2..01820fb267b 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -361,6 +361,8 @@ desc = "It's full of watery goodness." icon_state = "watermelon" potency = 10 + slice_path = /obj/item/weapon/reagent_containers/food/snacks/watermelonslice + slices_num = 5 New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -938,15 +940,4 @@ new/obj/effect/decal/cleanable/oil(src.loc) src.visible_message("The [src.name] has been squashed, causing a distortion in space-time.","You hear a splat and a crackle.") del(src) - return - -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon - name = "Watermelon" - icon_state = "A juicy watermelon" - icon_state = "watermelon" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/watermelonslice - slices_num = 5 - New() - ..() - reagents.add_reagent("nutriment", 10) - bitesize = 2 \ No newline at end of file + return \ No newline at end of file