From 5568ed15c1664dadb6060bece36eebeac7e3f1a6 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 22 Nov 2014 08:29:34 +1030 Subject: [PATCH 1/2] Randomizes strange seed icons, fixes poppies. --- code/modules/hydroponics/seed_datums.dm | 70 +++++++++++++++++-- .../reagent_containers/food/snacks/grown.dm | 8 +-- 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 50b28c755fd..661a1fbaa23 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -120,12 +120,73 @@ proc/populate_seed_list() display_name = "strange plants" // TODO: name generator. seed_noun = pick("spores","nodes","cuttings","seeds") - products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/generic_fruit) + products = list(pick(typesof(/obj/item/weapon/reagent_containers/food/snacks/grown)-/obj/item/weapon/reagent_containers/food/snacks/grown)) potency = rand(5,30) - //TODO: Finish generalizing the product icons so this can be randomized. - packet_icon = "seed-berry" - plant_icon = "berry" + var/list/plant_icons = list( + list("seed-chili", "chili"), + list("seed-icepepper", "chiliice"), + list("seed-berry", "berry"), + list("seed-glowberry", "glowberry"), + list("seed-poisonberry", "poisonberry"), + list("seed-deathberry", "deathberry"), + list("seed-nettle", "nettle"), + list("seed-deathnettle", "deathnettle"), + list("seed-tomato", "tomato"), + list("seed-bloodtomato", "bloodtomato"), + list("seed-killertomato", "killertomato"), + list("seed-bluetomato", "bluetomato"), + list("seed-bluespacetomato", "bluespacetomato"), + list("seed-eggplant", "eggplant"), + list("seed-eggy", "eggy"), + list("seed-apple", "apple"), + list("seed-goldapple", "goldapple"), + list("seed-ambrosiavulgaris", "ambrosiavulgaris"), + list("seed-ambrosiadeus", "ambrosiadeus"), + list("mycelium-chanter", "chanter"), + list("mycelium-plump", "plump"), + list("mycelium-reishi", "reishi"), + list("mycelium-liberty", "liberty"), + list("mycelium-amanita", "amanita"), + list("mycelium-angel", "angel"), + list("mycelium-tower", "towercap"), + list("mycelium-glowshroom", "glowshroom"), + list("mycelium-walkingmushroom","walkingmushroom"), + list("mycelium-plast", "plastellium"), + list("seed-harebell", "harebell"), + list("seed-poppy", "poppy"), + list("seed-sunflower", "sunflower"), + list("seed-grapes", "grape"), + list("seed-greengrapes", "greengrape"), + list("seed-peanut", "peanut"), + list("seed-cabbage", "cabbage"), + list("seed-shand", "shand"), + list("seed-mtear", "mtear"), + list("seed-banana", "banana"), + list("seed-corn", "corn"), + list("seed-potato", "potato"), + list("seed-soybean", "soybean"), + list("seed-wheat", "wheat"), + list("seed-rice", "rice"), + list("seed-carrot", "carrot"), + list("seed-ambrosiavulgaris", "weeds"), + list("seed-whitebeet", "whitebeet"), + list("seed-sugarcane", "sugarcane"), + list("seed-watermelon", "watermelon"), + list("seed-pumpkin", "pumpkin"), + list("seed-lime", "lime"), + list("seed-lemon", "lemon"), + list("seed-orange", "orange"), + list("seed-grass", "grass"), + list("seed-cocoapod", "cocoapod"), + list("seed-cherry", "cherry"), + list("seed-kudzu", "kudzu"), + list("seed-replicapod", "replicapod") + ) + + packet_icon = plant_icons[1] + plant_icon = plant_icons[2] + if(prob(20)) harvest_repeat = 1 @@ -1097,7 +1158,6 @@ proc/populate_seed_list() production = 6 yield = 6 growth_stages = 3 - plant_icon = "" /datum/seed/flower/sunflower name = "sunflowers" diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index 1a410fa6b3b..6e9bccbee95 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -195,12 +195,6 @@ user.SetLuminosity(round(user.luminosity - (potency/5),1)) src.SetLuminosity(round(potency/5,1)) -/obj/item/weapon/reagent_containers/food/snacks/grown/generic_fruit - name = "fruit" - desc = "It smells weird." - icon_state = "orange" - potency = 10 - /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod name = "cocoa pod" desc = "Can be ground into cocoa powder." @@ -642,4 +636,4 @@ new/obj/effect/decal/cleanable/blood/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 + return \ No newline at end of file From 66c6c0f270f4dc99a7355c95726d7ea0c289844d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 23 Nov 2014 10:11:43 +1030 Subject: [PATCH 2/2] Amendment to the previous. --- code/modules/hydroponics/seed_datums.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 661a1fbaa23..509d0697540 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -63,6 +63,7 @@ proc/populate_seed_list() var/seed_noun = "seeds" // Descriptor for packet. var/display_name // Prettier name. var/roundstart // If set, seed will not display variety number. + var/mysterious // Only used for the random seed packets. // Output. var/list/products // Possible fruit/other product paths. @@ -118,12 +119,13 @@ proc/populate_seed_list() roundstart = 0 seed_name = "strange plant" // TODO: name generator. display_name = "strange plants" // TODO: name generator. + mysterious = 1 seed_noun = pick("spores","nodes","cuttings","seeds") products = list(pick(typesof(/obj/item/weapon/reagent_containers/food/snacks/grown)-/obj/item/weapon/reagent_containers/food/snacks/grown)) potency = rand(5,30) - var/list/plant_icons = list( + var/list/plant_icons = pick(list( list("seed-chili", "chili"), list("seed-icepepper", "chiliice"), list("seed-berry", "berry"), @@ -182,7 +184,7 @@ proc/populate_seed_list() list("seed-cherry", "cherry"), list("seed-kudzu", "kudzu"), list("seed-replicapod", "replicapod") - ) + )) packet_icon = plant_icons[1] plant_icon = plant_icons[2] @@ -597,6 +599,10 @@ proc/populate_seed_list() for(var/i = 0;i