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

Merge pull request #4654 from xnqm8h/xenobotany-changes

Browse Source 
Fixes mutation chains for chomp seeds and some reaction formulas 🪴💊
This commit is contained in:
Nadyr
2022-08-07 03:00:51 -04:00
committed by GitHub
parent c0660476dc 06f95c94d3
commit aa75a3b2c0
8 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
code/modules/hydroponics/seed_datums_ch.dm
View File

@@ -1,4 +1,4 @@
//Variables to make certain things work. Consider sending upstream.
//Variables to make certain things work. Consider sending upstream.
/datum/seed
var/ai_mob_product = 0 //This variable determines whether or not a mob product is meant to be ai-controlled. If set to 0, mob products die without a player to control them.
@@ -12,21 +12,29 @@
/datum/seed/soybean/sapbean/orange
name = "orangesapbean"
mutants = list("Purplesapbean","bluesapbean","blacksapbean")
seed_name = "orange sapbean"
display_name = "orange sapbean"
mutants = list("purplesapbean","bluesapbean","blacksapbean")
chems = list("orangesap" = list(0,10))
/datum/seed/soybean/sapbean/purple
name = "purplesapbean"
mutants = list("Orangesapbean","bluesapbean","blacksapbean")
seed_name = "purple sapbean"
display_name = "purple sapbean"
mutants = list("orangesapbean","bluesapbean","blacksapbean")
chems = list("purplesap" = list(0,10))
/datum/seed/soybean/sapbean/blue
name = "bluesapbean"
seed_name = "blue sapbean"
display_name = "blue sapbean"
mutants = list("orangesapbean","purplesapbean","blacksapbean")
chems = list("bluesap" = list(0,10))
/datum/seed/soybean/sapbean/black //A bean with all the power but in so little quanitity
name = "blacksapbean"
seed_name = "black sapbean"
display_name = "black sapbean"
chems = list("bluesap" = list(1,2),"orangesap" = list(1,2),"purplesap" = list(1,2))
/datum/seed/soybean/sapbean/orange/New()
@@ -52,12 +60,12 @@
set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_YIELD,2)
//Adding self harvesting apples which contain poison and can mutate into poisonapples
/datum/seed/apple/falling
name = "fallingapple"
mutants = list("poisonapple")
can_self_harvest = 1
chems = list("nutriment" = list(1,5),"applejuice" = list(5,10),"cyanide" = list(1,3))
//Commenting out because self_harvesting can be troublesome.
// /datum/seed/apple/falling
// name = "fallingapple"
// mutants = list("poisonapple")
// can_self_harvest = 1
// chems = list("nutriment" = list(1,5),"applejuice" = list(5,10),"cyanide" = list(1,3))
/datum/seed/wheat/meatwheat
name = "meatwheat"
@@ -219,4 +227,4 @@
set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_PRODUCT_ICON, "stalk")
set_trait(TRAIT_PRODUCT_COLOUR, "#FF9A85")
set_trait(TRAIT_PLANT_ICON,"tree2")
set_trait(TRAIT_PLANT_ICON,"tree2")

4
code/modules/hydroponics/seedtypes/apples.dm
View File

@@ -4,7 +4,7 @@
seed_name = "apple"
display_name = "apple tree"
kitchen_tag = "apple"
mutants = list("poisonapple","goldapple")
mutants = list("poisonapple", "goldapple")
chems = list("nutriment" = list(1,10),"applejuice" = list(10,20))
/datum/seed/apple/New()
@@ -59,4 +59,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#0720c3")
set_trait(TRAIT_PLANT_ICON,"tree5")
set_trait(TRAIT_FLESH_COLOUR,"#05157d")
set_trait(TRAIT_IDEAL_LIGHT, 1)
set_trait(TRAIT_IDEAL_LIGHT, 1)

4
code/modules/hydroponics/seedtypes/flowers.dm
View File

@@ -41,6 +41,7 @@
name = "sunflowers"
seed_name = "sunflower"
display_name = "sunflowers"
mutants = list("solarflower") //CHOMPEdit - Adding mutation strain for solarflowers.
kitchen_tag = "sunflower"
/datum/seed/flower/sunflower/New()
@@ -58,6 +59,7 @@
seed_name = "lavender"
display_name = "lavender"
kitchen_tag = "lavender"
mutants = list("milkdew") //CHOMPEdit - Adding mutation strain for milkdew.
chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
/datum/seed/flower/lavender/New()
@@ -105,4 +107,4 @@
..()
set_trait(TRAIT_IDEAL_LIGHT, 1)
set_trait(TRAIT_PLANT_COLOUR,"#5e0303")
set_trait(TRAIT_CARNIVOROUS,1)
set_trait(TRAIT_CARNIVOROUS,1)

3
code/modules/hydroponics/seedtypes/potato.dm
View File

@@ -3,6 +3,7 @@
seed_name = "potato"
display_name = "potatoes"
kitchen_tag = "potato"
mutants = list("voltato") //CHOMPEdit - Adding mutation strain for voltatoes.
chems = list("nutriment" = list(1,10), "potatojuice" = list(10,10))
/datum/seed/potato/New()
@@ -15,4 +16,4 @@
set_trait(TRAIT_PRODUCT_ICON,"potato")
set_trait(TRAIT_PRODUCT_COLOUR,"#D4CAB4")
set_trait(TRAIT_PLANT_ICON,"bush2")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)

3
code/modules/hydroponics/seedtypes/soybean.dm
View File

@@ -3,6 +3,7 @@
seed_name = "soybean"
display_name = "soybeans"
kitchen_tag = "soybeans"
mutants = list("orangesapbean","bluesapbean","purplesapbean") //CHOMPEdit - Adding mutation strain for sap beans.
chems = list("nutriment" = list(1,20), "soymilk" = list(10,20))
/datum/seed/soybean/New()
@@ -14,4 +15,4 @@
set_trait(TRAIT_POTENCY,5)
set_trait(TRAIT_PRODUCT_ICON,"bean")
set_trait(TRAIT_PRODUCT_COLOUR,"#EBE7C0")
set_trait(TRAIT_PLANT_ICON,"stalk")
set_trait(TRAIT_PLANT_ICON,"stalk")

3
code/modules/hydroponics/seedtypes/wheat.dm
View File

@@ -3,6 +3,7 @@
seed_name = "wheat"
display_name = "wheat stalks"
kitchen_tag = "wheat"
mutants = list("meatwheat") //CHOMPEdit - Adding mutation strain for meatwheat.
chems = list("nutriment" = list(1,25), "flour" = list(10,30))
/datum/seed/wheat/New()
@@ -16,4 +17,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#BFAF82")
set_trait(TRAIT_PLANT_ICON,"stalk2")
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)

26
code/modules/reagents/reactions/instant/instant_ch.dm
View File

@@ -4,7 +4,7 @@
result = "aphrodisiac"
required_reagents = list("carbon" = 2, "hydrogen" = 2, "oxygen" = 2, "water" = 1)
result_amount = 6
/decl/chemical_reaction/instant/claridyl
name = "claridyl"
id = "claridyl"
@@ -37,7 +37,7 @@
id = "eden_snake"
result = "eden_snake"
required_reagents = list("eden" = 1, "ethanol" = 1)
/decl/chemical_reaction/instant/tercozolam
id = "tercozolam"
result = "tercozolam"
@@ -48,8 +48,8 @@
name = "Peridaxon"
id = "peridaxon_ch"
result = "peridaxon"
required_reagents = list("cordradaxon" = 1, "gastirodaxon" = 1, "hepanephrodaxon" = 1, "respirodaxon" = 1)
result_amount = 12 //More phoron-efficient alternative recipe.
required_reagents = list("cordradaxon" = 1, "gastirodaxon" = 1, "hepanephrodaxon" = 1, "respirodaxon" = 1)
result_amount = 12 //More phoron-efficient alternative recipe.
/decl/chemical_reaction/instant/sorbitol
name = "Sorbitol"
@@ -78,7 +78,7 @@
name = "Bullvalene"
id = "bullvalene"
result = "bullvalene"
required_reagents = list("dermaline" = 1, "orangesap" = 1, "Copper" = 1)
required_reagents = list("dermaline" = 1, "orangesap" = 1, "copper" = 1)
result_amount = 1
/decl/chemical_reaction/instant/nutrient
@@ -87,16 +87,16 @@
result = "nutriment"
required_reagents = list("purplesap" = 1, "orangesap" = 1, "bluesap" = 1)
result_amount = 3
/////SERAZINE RECIPES//////
/decl/chemical_reaction/instant/alizine
name = "Alizine"
id = "alizine"
result = "alizine"
/decl/chemical_reaction/instant/alizene
name = "Alezine"
id = "alezine"
result = "alezine"
required_reagents = list("bicaridine" = 1, "serazine" = 1, "tungsten" = 1)
result_amount = 3
/////GENDER CHANGE RECIPES/////
/decl/chemical_reaction/instant/change_drug/male
@@ -119,7 +119,7 @@
result = "change_drug_intersex"
required_reagents = list("change_drug_male" = 1, "change_drug_female" = 1)
result_amount = 1
// Frost oil reactions for material sheets
/decl/chemical_reaction/instant/solidification/aluminium
name = "Solid Aluminium"
@@ -132,7 +132,7 @@
id = "solidcopper"
required_reagents = list("frostoil" = 5, "copper" = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/copper
//YW stuff
/decl/chemical_reaction/instant/benzilate
name = "Benzilate"

2
code/modules/reagents/reagents/medicine_ch.dm
View File

@@ -142,7 +142,7 @@
/datum/reagent/bullvalene //This is for the third sap. It converts Brute Oxy and burn into slightly less toxins.
name = "bullvalene"
id = "bullvalene"
description = "witty pending description. Converts brute and burn into toxin. Or at least is supposed to."
description = "A catalytic chemical that can treat a wide variety of ailments at the cost of toxifying the host's body."
taste_description = "sulfur"
reagent_state = LIQUID
color = "#163851"