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 83506180..a239f1f5 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi index a59fdd0f..0db875fa 100644 Binary files a/icons/obj/vending_restock.dmi and b/icons/obj/vending_restock.dmi differ