cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Randomizes strange seed icons, fixes poppies.

Browse Source
This commit is contained in:
Zuhayr
2014-11-22 08:29:34 +10:30
parent efcf9a9d34
commit 5568ed15c1
2 changed files with 66 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
code/modules/hydroponics/seed_datums.dm
View File

@@ -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"

8
code/modules/reagents/reagent_containers/food/snacks/grown.dm
View File

@@ -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("<span class='notice'>The [src.name] has been squashed, causing a distortion in space-time.</span>","<span class='moderate'>You hear a splat and a crackle.</span>")
del(src)
return
return