diff --git a/code/datums/chemistry/Chemistry-Recipes.dm b/code/datums/chemistry/Chemistry-Recipes.dm index 0880866a..df9099fd 100644 --- a/code/datums/chemistry/Chemistry-Recipes.dm +++ b/code/datums/chemistry/Chemistry-Recipes.dm @@ -1133,6 +1133,31 @@ datum mix_phrase = "Slightly dizzying fumes drift from the solution." mix_sound = 'sound/misc/drinkfizz.ogg' + mdma //MDMA and space drugs are already super similar. It's not very close to real life recipes but fuck it, I want this to be a botany friendly space drugs method. + name = "MDMA" + id = "mdma" + result = "space_drugs" + required_reagents = list("safrole" = 1, "salbutamol" = 1, "nitrogen"=1, "water" = 1) + mix_phrase = "A white particulate settles from the solution." + mix_sound = 'sound/misc/drinkfizz.ogg' + result_amount = 1 + on_reaction(var/datum/reagents/holder, created_volume) + //CHECK FOR RECURSIVE REACTIONS AND RESOLVE + var/safrole = holder.get_reagent_amount("safrole") + var/nitrogen = holder.get_reagent_amount("nitrogen") + var/temp = 0 + while(safrole && nitrogen) + temp = min(safrole,nitrogen,created_volume) + holder.add_reagent("space_drugs",temp) + safrole -= temp + holder.remove_reagent("safrole", temp) + nitrogen -= temp + holder.remove_reagent("nitrogen", temp) + + holder.add_reagent("salbutamol",created_volume) + holder.add_reagent("water",created_volume) + return + lube name = "Space Lube" id = "lube" diff --git a/code/datums/chemistry/Reagents-FoodDrink.dm b/code/datums/chemistry/Reagents-FoodDrink.dm index 7db5ea6a..49b16219 100644 --- a/code/datums/chemistry/Reagents-FoodDrink.dm +++ b/code/datums/chemistry/Reagents-FoodDrink.dm @@ -1425,6 +1425,28 @@ datum ..(M) return + fooddrink/sarsaparilla // traditionally non-caffeinated + name = "sarsaparilla" + id = "sarsaparilla" + description = "A refreshing beverage that only like, four people on station like." + reagent_state = LIQUID + fluid_r = 86 + fluid_g = 43 + fluid_b = 43 + transparency = 190 + taste = "sugary" + thirst_value = 0.75 + hygiene_value = -0.5 + + on_mob_life(var/mob/M) + if (ishuman(M)) + var/mob/living/carbon/human/H = M + if (H.sims) + H.sims.affectMotive("bladder", -1.25) + M.bodytemperature = max(M.base_body_temp, M.bodytemperature-5) + ..(M) + return + fooddrink/cheese name = "cheese" id = "cheese" diff --git a/code/datums/chemistry/Reagents-Misc.dm b/code/datums/chemistry/Reagents-Misc.dm index 03c86023..0c58ddf7 100644 --- a/code/datums/chemistry/Reagents-Misc.dm +++ b/code/datums/chemistry/Reagents-Misc.dm @@ -1991,6 +1991,15 @@ datum P.HYPdamageplant("poison",2) P.growth -= 3 + safrole + name = "safrole" + id = "safrole" + description = "A common food additive with a distinctive 'candy shop' aroma." + fluid_r = 100 + fluid_g = 100 + fluid_b = 0 + transparency = 200 + ash name = "ash" id = "ash" diff --git a/code/datums/hydroponics/plant_mutations.dm b/code/datums/hydroponics/plant_mutations.dm index 8ff4ca41..7cd879df 100644 --- a/code/datums/hydroponics/plant_mutations.dm +++ b/code/datums/hydroponics/plant_mutations.dm @@ -351,4 +351,11 @@ name = "Money Tree" iconmod = "Cash" crop = /obj/item/spacecash + chance = 20 + +/datum/plantmutation/tree/sassafras + name = "Sassafras Tree" + iconmod = "Sassafras" + assoc_reagents = list("safrole") + crop = /obj/item/plant/herb/sassafras chance = 20 \ No newline at end of file diff --git a/code/datums/hydroponics/plants_crop.dm b/code/datums/hydroponics/plants_crop.dm index 79412d27..319b48ac 100644 --- a/code/datums/hydroponics/plants_crop.dm +++ b/code/datums/hydroponics/plants_crop.dm @@ -41,7 +41,7 @@ name = "Bean" category = "Miscellaneous" seedcolor = "#AA7777" - crop = /obj/item/reagent_containers/food/snacks/ingredient/bean + crop = /obj/item/reagent_containers/food/snacks/plant/bean starthealth = 40 growtime = 50 harvtime = 130 @@ -49,8 +49,9 @@ harvests = 5 endurance = 0 genome = 6 - vending = 0 + vending = 1 commuts = list(/datum/plant_gene_strain/immunity_toxin,/datum/plant_gene_strain/metabolism_slow) + assoc_reagents = list("nitrogen") /datum/plant/corn name = "Corn" @@ -175,5 +176,5 @@ genome = 20 force_seed_on_harvest = 1 vending = 1 - mutations = list(/datum/plantmutation/tree/money) + mutations = list(/datum/plantmutation/tree/money,/datum/plantmutation/tree/sassafras) commuts = list(/datum/plant_gene_strain/metabolism_fast,/datum/plant_gene_strain/metabolism_slow,/datum/plant_gene_strain/resistance_drought) \ No newline at end of file diff --git a/code/obj/item/food/ingredients.dm b/code/obj/item/food/ingredients.dm index 0344a316..fa9f376c 100644 --- a/code/obj/item/food/ingredients.dm +++ b/code/obj/item/food/ingredients.dm @@ -145,13 +145,6 @@ amount = 1 food_color = "#FFFFAA" -/obj/item/reagent_containers/food/snacks/ingredient/bean - name = "bean pod" - desc = "This bean pod contains an inordinately large amount of beans due to genetic engineering. How convenient." - icon_state = "beanpod" - amount = 1 - food_color = "#CCFFCC" - /obj/item/reagent_containers/food/snacks/ingredient/sugar name = "sugar" desc = "How sweet." diff --git a/code/obj/item/food/plants.dm b/code/obj/item/food/plants.dm index a95effd2..e6c8f359 100644 --- a/code/obj/item/food/plants.dm +++ b/code/obj/item/food/plants.dm @@ -129,6 +129,18 @@ food_color = "#4A7402" plant_reagent = "grease" +/obj/item/reagent_containers/food/snacks/plant/bean + name = "bean pod" + desc = "This bean pod contains an inordinately large amount of beans due to genetic engineering. How convenient." + planttype = /datum/plant/beans + icon_state = "beanpod" + amount = 1 + heal_amt = 1 + throwforce = 0 + force = 0 + plant_reagent = "nitrogen" + food_color = "#CCFFCC" + /obj/item/reagent_containers/food/snacks/plant/soylent name = "soylent chartreuse" desc = "Contains high-energy plankton!" diff --git a/code/obj/item/plants.dm b/code/obj/item/plants.dm index 09740650..d778d5c8 100644 --- a/code/obj/item/plants.dm +++ b/code/obj/item/plants.dm @@ -180,6 +180,12 @@ desc = "Fibers from the stem of a Venne vine. Though tasting foul, it has remarkable anti-toxic properties." icon_state = "venne" +/obj/item/plant/herb/sassafras + name = "sassafras root" + desc = "Roots from a Sassafras tree. Can be fermented into delicious sarsaparilla." + icon_state = "sassafras" + brew_result = "sarsaparilla" + /obj/item/plant/herb/venne/toxic name = "black venne fibers" desc = "It's black and greasy. Kinda gross." diff --git a/icons/obj/foodNdrink/food_ingredient.dmi b/icons/obj/foodNdrink/food_ingredient.dmi index 7119f6ba..bf99ad20 100644 Binary files a/icons/obj/foodNdrink/food_ingredient.dmi and b/icons/obj/foodNdrink/food_ingredient.dmi differ diff --git a/icons/obj/foodNdrink/food_produce.dmi b/icons/obj/foodNdrink/food_produce.dmi index f11585aa..c64d970b 100644 Binary files a/icons/obj/foodNdrink/food_produce.dmi and b/icons/obj/foodNdrink/food_produce.dmi differ diff --git a/icons/obj/hydroponics/hydro_mutants.dmi b/icons/obj/hydroponics/hydro_mutants.dmi index b517eadd..8e3ef935 100644 Binary files a/icons/obj/hydroponics/hydro_mutants.dmi and b/icons/obj/hydroponics/hydro_mutants.dmi differ diff --git a/icons/obj/hydroponics/hydromisc.dmi b/icons/obj/hydroponics/hydromisc.dmi index 03d618af..420a0674 100644 Binary files a/icons/obj/hydroponics/hydromisc.dmi and b/icons/obj/hydroponics/hydromisc.dmi differ