From c729c61765a9c844465ab2081ab3e8df6c1ba525 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Sun, 21 Feb 2021 09:57:29 -0700 Subject: [PATCH] added tons of botany changes from citadel (not instability) --- code/modules/cargo/packs/organic.dm | 14 ++--- code/modules/hydroponics/grown/banana.dm | 3 +- code/modules/hydroponics/grown/mushrooms.dm | 30 ++++------ .../chemistry/reagents/medicine_reagents.dm | 55 ++++++++++++++++++ .../reagents/chemistry/recipes/medicine.dm | 14 +++++ .../research/designs/biogenerator_designs.dm | 6 +- code/modules/vending/megaseed.dm | 1 + code/modules/vending/nutrimax.dm | 1 + icons/obj/clothing/neck.dmi | Bin 2942 -> 3078 bytes icons/obj/vending_restock.dmi | Bin 1777 -> 1884 bytes 10 files changed, 90 insertions(+), 34 deletions(-) diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index 05a91ab7..6d89b7ed 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -200,7 +200,7 @@ //ALIEN-ESQUE SEEDS CRATE /datum/supply_pack/organic/rareseeds name = "Galactic Seeds Crate" - desc = "Feel the need to explore the vastness of space, condensed into a single crate! Contains at least 4 seeds from random regions of space." + desc = "Explore the vastness of space, now condensed into a single crate! Contains at least 4 seeds from random regions of space." cost = 9500 //See fill proc. I know this costs a lot contains = list() crate_name = "galactic seeds crate" @@ -301,14 +301,10 @@ else chosen_seed = pick(lavaland_seeds) - + new chosen_seed(C) cache = chosen_seed - - if(istype(chosen_seed,/obj/item/seeds/starthistle) - new chosen_seed(C) - continue //Make it actually seem like it's from another galaxy with all this stuff - if(prob(15) && !istype(chosen_seed, /obj/item/seeds/starthistle) + if(prob(23) && !istype(chosen_seed, /obj/item/seeds/starthistle)) chosen_seed.rarity += 1 var/mutated = FALSE @@ -374,13 +370,11 @@ else qdel(R) chosen_seed.reagents_from_genes() - - new chosen_seed(C) //All in a while() loop! Very efficient I know /datum/supply_pack/organic/grill name = "Grilling Starter Kit" - desc = "Hey dad I'm Hungry. Hi Hungry I'm THE NEW GRILLING STARTER KIT ONLY 5000 BUX GET NOW! Contains a cooking grill and five fuel coal sheets." + desc = "Hey dad, I'm Hungry. Hi Hungry I'm THE NEW GRILLING STARTER KIT ONLY 5000 BUX GET NOW! Contains a cooking grill and five fuel coal sheets." cost = 3000 crate_type = /obj/structure/closet/crate contains = list(/obj/item/stack/sheet/mineral/coal/five, diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index ae76f581..162bbbc5 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -30,7 +30,8 @@ /obj/item/reagent_containers/food/snacks/grown/banana/generate_trash(atom/location) . = ..() var/obj/item/grown/bananapeel/peel = . - peel.grind_results = list(/datum/reagent/consumable/banana_peel = seed.potency * 0.2) + if(istype(peel)) + peel.grind_results = list(/datum/reagent/consumable/banana_peel = seed.potency * 0.2) /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user) user.visible_message("[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!") diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 1098ad5d..360419a6 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -221,7 +221,7 @@ genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' reagents_add = list(/datum/reagent/consumable/nutriment = 0.1) - mutatelist = list(/obj/item/seeds/chanterelle/jupitercup, /obj/item/seeds/chanterelle/jupitercup/hollow, /obj/item/seeds/chanterelle/jupitercup/monochrome) + mutatelist = list(/obj/item/seeds/chanterelle/jupitercup, /obj/item/seeds/chanterelle/jupitercup/monochrome) /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle seed = /obj/item/seeds/chanterelle @@ -265,8 +265,8 @@ genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/plant_type/carnivory, /datum/plant_gene/trait/modified_color/opaque) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' reagents_add = list(/datum/reagent/consumable/nutriment = 0.1) - mutatelist = list(/obj/item/seeds/chanterelle/jupitercup) - color = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0.66,0.66,0.66,0.66, 0,0,0,0) + mutatelist = list(/obj/item/seeds/chanterelle/jupitercup, /obj/item/seeds/chanterelle/jupitercup/monochrome) + color = list(1,0,0,0, 0,1,0,0, 0,0,1,0, -0.3,-0.3,-0.3,0.7, 0,0,0,0) modified_colors = TRUE /obj/item/seeds/chanterelle/jupitercup/monochrome @@ -280,7 +280,7 @@ genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/plant_type/carnivory, /datum/plant_gene/trait/modified_color/monochrome) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' reagents_add = list(/datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/nothing = 0.02) - mutatelist = list(/obj/item/seeds/chanterelle/jupitercup) + mutatelist = list(/obj/item/seeds/chanterelle/jupitercup, /obj/item/seeds/chanterelle/jupitercup/hollow) color = list(0.5,0.5,0.5,0, 0.5,0.5,0.5,0, 0.5,0.5,0.5,0, 0,0,0,1, 0,0,0,0) modified_colors = TRUE @@ -453,18 +453,13 @@ /obj/item/seeds/lavaland/inocybe/magenta name = "pack of dilated inocybe mycelium" desc = "This mycelium grows into a specially-colored inocybe mushroom, their shifted cells make them appear red." - plantname = "Magenta Inocybe Mushrooms" + plantname = "Red Inocybe Mushrooms" lifespan = 4 endurance = 5 maturation = 3 - genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/modified_color/magenta) + genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/modified_color/monochrome/red) mutatelist = list() - color = list( - 0.25, 0.5, 1, 0, - 1, 0.25, 0.5, 0, - 0.5, 1, 0.25, 0, - 0,0,0,1, - 0,0,0,0) + color = list(0.8,0,0,0, 0.8,0.5,0.5,0, 0.8,0.5,0.5,0, 0,0,0,1, 0,0,0,0) modified_colors = TRUE // Embershroom (Mushroom stem) @@ -483,18 +478,13 @@ /obj/item/seeds/lavaland/ember/cyan name = "pack of dilated embershroom mycelium" desc = "This mycelium grows into a specially-colored embershroom mushroom, their shifted cells make them appear blue." - plantname = "Magenta Embershroom Mushrooms" + plantname = "Blue Embershroom Mushrooms" lifespan = 6 endurance = 10 maturation = 4 yield = 2 potency = 25 - genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/glow/blue, /datum/plant_gene/trait/modified_color/cyan) + genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/glow/blue, /datum/plant_gene/trait/modified_color/monochrome/blue) mutatelist = list() - color = list( - 0.25, 1, 0.5, 0, - 0.5, 0.25, 1, 0, - 1, 0.5, 0.25, 0, - 0,0,0,1, - 0,0,0,0) + color = list(0.5,0.5,0.8,0, 0.5,0.5,0.8,0, 0,0,0.8,0, 0,0,0,1, 0,0,0,0) modified_colors = TRUE diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 6cf4be4a..3c82ea56 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1464,3 +1464,58 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M) M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5) ..() . = 1 + +/datum/reagent/medicine/coagulant + name = "Sanguirite" + description = "A proprietary coagulant used to help bleeding wounds clot faster." + reagent_state = LIQUID + color = "#bb2424" + metabolization_rate = 0.25 * REAGENTS_METABOLISM + overdose_threshold = 20 + /// How much base clotting we do per bleeding wound, multiplied by the below number for each bleeding wound + var/clot_rate = 0.25 + /// If we have multiple bleeding wounds, we count the number of bleeding wounds, then multiply the clot rate by this^(n) before applying it to each cut, so more cuts = less clotting per cut (though still more total clotting) + var/clot_coeff_per_wound = 0.9 + +/* //Residue from porting citadel's botany things. We don't have wounds yet (i think); uncomment this when it becomes a thing +/datum/reagent/medicine/coagulant/on_mob_life(mob/living/carbon/M) + . = ..() + if(!M.blood_volume || !M.all_wounds) + return + + var/effective_clot_rate = clot_rate + + for(var/i in M.all_wounds) + var/datum/wound/iter_wound = i + if(iter_wound.blood_flow) + effective_clot_rate *= clot_coeff_per_wound + + for(var/i in M.all_wounds) + var/datum/wound/iter_wound = i + iter_wound.blood_flow = max(0, iter_wound.blood_flow - effective_clot_rate) +*/ + +/datum/reagent/medicine/coagulant/overdose_process(mob/living/M) + . = ..() + if(!M.blood_volume) + return + + if(prob(15)) + M.losebreath += rand(2,4) + M.adjustOxyLoss(rand(1,3)) + if(prob(30)) + to_chat(M, "You can feel your blood clotting up in your veins!") + else if(prob(10)) + to_chat(M, "You feel like your blood has stopped moving!") + if(prob(50)) + var/obj/item/organ/lungs/our_lungs = M.getorganslot(ORGAN_SLOT_LUNGS) + our_lungs.applyOrganDamage(1) + else + var/obj/item/organ/heart/our_heart = M.getorganslot(ORGAN_SLOT_HEART) + our_heart.applyOrganDamage(1) + +// can be synthesized on station rather than bought. made by grinding a banana peel, heating it up, then mixing the banana peel powder with salglu +/datum/reagent/medicine/coagulant/weak + name = "Synthi-Sanguirite" + description = "A synthetic coagulant used to help bleeding wounds clot faster. Not quite as effective as name brand Sanguirite, especially on patients with lots of cuts." + clot_coeff_per_wound = 0.8 diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index 6d6deb71..2fdd7d29 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -50,6 +50,20 @@ results = list(/datum/reagent/medicine/salglu_solution = 3) required_reagents = list(/datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/water = 1, /datum/reagent/consumable/sugar = 1) +/datum/chemical_reaction/baked_banana_peel + name = "Baked Banana Peel" + results = list(/datum/reagent/consumable/baked_banana_peel = 1) + required_temp = 413.15 + required_reagents = list(/datum/reagent/consumable/banana_peel = 1) + mix_message = "The pulp dries up and takes on a powdery state!" + mob_react = FALSE + +/datum/chemical_reaction/coagulant_weak + name = "Weak Coagulant" + results = list(/datum/reagent/medicine/coagulant/weak = 3) + required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/consumable/baked_banana_peel = 1) + mob_react = FALSE + /datum/chemical_reaction/mine_salve name = "Miner's Salve" id = /datum/reagent/medicine/mine_salve diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index cb0b2e78..c893573f 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -113,12 +113,12 @@ name = "10u Unstable Mutagen" id = "fabricated_mutagen" build_type = BIOGENERATOR - materials = list(MAT_BIOMASS = 75) + materials = list(MAT_BIOMASS = 30) make_reagents = list(/datum/reagent/toxin/mutagen = 10) //suffer category = list("initial","Botany Chemicals") /datum/design/weed_killer - name = "Weed Killer" + name = "10u Weed Killer" id = "weed_killer" build_type = BIOGENERATOR materials = list(MAT_BIOMASS = 10) @@ -126,7 +126,7 @@ category = list("initial","Botany Chemicals") /datum/design/pest_spray - name = "Pest Killer" + name = "10u Pest Killer" id = "pest_spray" build_type = BIOGENERATOR materials = list(MAT_BIOMASS = 10) diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index 3bcff190..b3a7d830 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -62,4 +62,5 @@ refill_canister = /obj/item/vending_refill/hydroseeds /obj/item/vending_refill/hydroseeds + machine_name = "MegaSeed" icon_state = "refill_hydro" diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm index 74edeadd..32a0caae 100644 --- a/code/modules/vending/nutrimax.dm +++ b/code/modules/vending/nutrimax.dm @@ -21,4 +21,5 @@ refill_canister = /obj/item/vending_refill/hydronutrients /obj/item/vending_refill/hydronutrients + machine_name = "NutriMax" icon_state = "refill_hydro" diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 83506180b32a5ffd44a3d0b44cdfce1b2935fc2a..a239f1f5d4aadecebacc624ccd4aed035da1e58b 100644 GIT binary patch delta 2733 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 X{yTEhu3VdI00000NkvXXu0mjf1ozA9 diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi index a59fdd0f520c93694e26e09cc4e7df8127996d9b..0db875faa456b34c2e79a6b48435fa2386201ab9 100644 GIT binary patch delta 1504 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

5DJB=di- z(-ZSQIy*Z5gu5uSGak?#jaH!y0xAK8G(_eMr9ul@t7uNF9Qrj88&0000$Fn<