Merge pull request #1139 from LunarFleet/plant

Make it so Alraune can properly choose what they grow
This commit is contained in:
Razgriz
2021-01-19 15:07:04 -07:00
committed by GitHub
2 changed files with 6 additions and 2 deletions
+4
View File
@@ -34,6 +34,7 @@ var/global/list/acceptable_fruit_types= list(
"durian",
"eggplant",
"grapes",
"grass", // CH changes
"greengrapes",
"harebells",
"lavender",
@@ -46,14 +47,17 @@ var/global/list/acceptable_fruit_types= list(
"poppies",
"potato",
"pumpkin",
"reishi", // CH changes
"rice",
"rose",
"rhubarb",
"shand", // CH changes
"soybean",
"spineapple",
"sugarcane",
"sunflowers",
"tomato",
"towercap", // CH changes
"vanilla",
"watermelon",
"wheat",
@@ -62,7 +62,7 @@
flesh_color = "#9ee02c"
blood_color = "#edf4d0" //sap!
base_color = "#1a5600"
reagent_tag = IS_ALRAUNE
blurb = "Alraunes are a rare sight in space. Their bodies are reminiscent of that of plants, and yet they share many\
@@ -401,7 +401,7 @@
if(selection)
fruit_gland.fruit_type = selection
verbs |= /mob/living/carbon/human/proc/alraune_fruit_pick
verbs -= /mob/living/carbon/human/proc/alraune_fruit_select
//verbs -= /mob/living/carbon/human/proc/alraune_fruit_select // Chomp Edit
fruit_gland.organ_owner = src
fruit_gland.emote_descriptor = list("fruit right off of [fruit_gland.organ_owner]!", "a fruit from [fruit_gland.organ_owner]!")