From c64a2515044a0fbfb2bcc155dd9c22809187a6b9 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Fri, 6 Dec 2024 22:47:10 +0100 Subject: [PATCH] mecdicine_vr --- code/__defines/reagents.dm | 297 ++---------------- code/datums/diseases/choreomania.dm | 4 +- code/datums/diseases/fake_gbs.dm | 2 +- code/datums/diseases/gbs.dm | 2 +- .../game/objects/structures/tank_dispenser.dm | 4 +- code/modules/food/glass/bottle_potion.dm | 8 +- code/modules/food/glass/bottle_vr.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 4 +- .../carbon/human/species/species_attack_vr.dm | 12 +- .../species/station/traits_vr/neutral.dm | 2 +- code/modules/nifsoft/software/10_combat.dm | 2 +- .../reagents/reactions/instant/instant_vr.dm | 30 +- .../reagents/reactions/instant/virology.dm | 6 +- .../reagents/reagent_containers/hypospray.dm | 2 +- .../reagents/reagent_containers/pill_vr.dm | 4 +- code/modules/reagents/reagents/medicine_vr.dm | 36 +-- code/modules/vore/eating/belly_obj_vr.dm | 2 +- code/modules/vore/eating/bellymodes_vr.dm | 4 +- .../tgui/interfaces/TankDispenser.tsx | 14 +- 19 files changed, 92 insertions(+), 345 deletions(-) diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm index 5fcf7d9fe8..4de8863dd1 100644 --- a/code/__defines/reagents.dm +++ b/code/__defines/reagents.dm @@ -158,6 +158,27 @@ #define REAGENT_ID_LEAD "lead" +// Medicines +#define REAGENT_ADRANOL "Adranol" +#define REAGENT_ID_ADRANOL "adranol" +#define REAGENT_NUMBENZYME "Numbing Enzyme" +#define REAGENT_ID_NUMBENZYME "numbenzyme" +#define REAGENT_VERMICETOL "Vermicetol" +#define REAGENT_ID_VERMICETOL "vermicetol" +#define REAGENT_SLEEVINGCURE "Kitsuhanan Cure" +#define REAGENT_ID_SLEEVINGCURE "sleevingcure" +#define REAGENT_PRUSSIANBLUE "Prussian Blue" +#define REAGENT_ID_PRUSSIANBLUE "prussian_blue" +#define REAGENT_LIPOZILASE "Lipozilase" +#define REAGENT_ID_LIPOZILASE "lipozilase" +#define REAGENT_LIPOSTIPO "Lipostipo" +#define REAGENT_ID_LIPOSTIPO "lipostipo" +#define REAGENT_POLYMORPH "Transforitine" +#define REAGENT_ID_POLYMORPH "polymorph" +#define REAGENT_GLAMOUR "Glamour" +#define REAGENT_ID_GLAMOUR "glamour" + + // Virology #define REAGENT_VACCINE "Vaccine" #define REAGENT_ID_VACCINE "vaccine" @@ -375,7 +396,7 @@ -Files left: food_drinks.dm, medicine.dm, medicine_vr.dm, other.dm, toxins.dm +Files left: food_drinks.dm, medicine.dm, other.dm, toxins.dm includes: .dm excludes: reagents.dm,ores.dm,materials.dm,mre.dm @@ -409,277 +430,3 @@ excludes: reagents.dm,ores.dm,materials.dm,mre.dm #define REAGENT_ID_URANIUM "uranium" #define REAGENT_ID_PLATINUM "platinum" #define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate" - -todos -defective_nanites -coco -mold -left4zed - var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,"condensedcapsaicin_v","frostoil") - var/randomized_reagent = REAGENT_ID_IRON // The reagent chosen at random to be produced, if there's no one piloting the worm. - var/passive_reagent = "paracetamol" // Reagent passively produced by the leech. Should usually be a painkiller. - - - - - - xenoChemList += "inaprovaline" - xenoChemList += "bicaridine" - xenoChemList += "dylovene" - xenoChemList += "dexalinp" - xenoChemList += "tricordrazine" - xenoChemList += "cryoxadone" - xenoChemList += "clonexadone" - xenoChemList += "paracetamol" - xenoChemList += "tramadol" - xenoChemList += "oxycodone" - xenoChemList += "ryetalyn" - xenoChemList += "hyperzine" - xenoChemList += "ethylredoxrazine" - xenoChemList += "hyronalin" - xenoChemList += "arithrazine" - xenoChemList += "spaceacillin" - xenoChemList += "sterilizine" - xenoChemList += "leporazine" - xenoChemList += "methylphenidate" - xenoChemList += "citalopram" - xenoChemList += "paroxetine" - xenoChemList += "macrocillin" - xenoChemList += "microcillin" - xenoChemList += "normalcillin" - xenoChemList += "sizeoxadone" - xenoChemList += "ickypak" - xenoChemList += "unsorbitol" - xenoChemList += "toxin" - xenoChemList += "carpotoxin" - xenoChemList += "potassium_chloride" - xenoChemList += "potassium_chlorophoride" - xenoChemList += "zombiepowder" - xenoChemList += "fertilizer" - xenoChemList += "eznutrient" - xenoChemList += "left4zed" - xenoChemList += "robustharvest" - xenoChemList += "plantbgone" - xenoChemList += "serotrotium" - xenoChemList += "nicotine" - xenoChemList += "uranium" - xenoChemList += "silver" - xenoChemList += "gold" - xenoChemList += "adrenaline" - xenoChemList += "holywater" - xenoChemList += "ammonia" - xenoChemList += "diethylamine" - xenoChemList += "fluorosurfactant" - xenoChemList += "foaming_agent" - xenoChemList += "thermite" - xenoChemList += "cleaner" - xenoChemList += "lube" - xenoChemList += "glycerol" - xenoChemList += "coolant" - xenoChemList += "luminol" - xenoChemList += "cornoil" - xenoChemList += "lipozine" - xenoChemList += "sodiumchloride" - xenoChemList += "frostoil" - xenoChemList += "capsaicin" - xenoChemList += "condensedcapsaicin" - xenoChemList += "neurotoxin" - - -supermatter -mydrogen -silicon - -deuterium -tritium -helium-3 -boron - "adminordrazine", - REAGENT_ID_NUTRIMENT, - "macrocillin", - "microcillin", - "normalcillin", - "magicdust" - kitchen_tag = "lime" - chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20)) - -/datum/seed/citrus/New() - ..() - set_trait(TRAIT_HARVEST_REPEAT,1) - set_trait(TRAIT_JUICY,1) - set_trait(TRAIT_MATURATION,6) - set_trait(TRAIT_PRODUCTION,6) - set_trait(TRAIT_YIELD,4) - set_trait(TRAIT_POTENCY,15) - set_trait(TRAIT_PRODUCT_ICON,"treefruit") - set_trait(TRAIT_PRODUCT_COLOUR,"#3AF026") - set_trait(TRAIT_PLANT_ICON,"tree") - set_trait(TRAIT_FLESH_COLOUR,"#3AF026") - -/datum/seed/citrus/lemon - name = "lemon" - seed_name = "lemon" - display_name = "lemon trees" - kitchen_tag = "lemon" - chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20)) - -/datum/seed/citrus/lemon/New() - ..() - set_trait(TRAIT_PRODUCES_POWER,1) - set_trait(TRAIT_PRODUCT_ICON,"lemon") - set_trait(TRAIT_PRODUCT_COLOUR,"#F0E226") - set_trait(TRAIT_FLESH_COLOUR,"#F0E226") - set_trait(TRAIT_IDEAL_LIGHT, 6) - -/datum/seed/citrus/orange - name = "orange" - seed_name = "orange" - display_name = "orange trees" - kitchen_tag = "orange" - chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20)) - list("zombiepowder" = list(1,10),"condensedcapsaicin""imidazoline" = list(3,5), "carrotjuice" = list(10,20)) - chemreact = list( REAGENT_ID_NUTRIMENT = list(XENO_CHEM_NUTRI = 0.5), - "radium" = list(XENO_CHEM_TOXIC = 0.3, XENO_CHEM_MUT = 1), - "mutagen" = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2), - "water" = list(XENO_CHEM_NUTRI = -0.1), - "milk" = list(XENO_CHEM_NUTRI = 0.3), - "sacid" = list(XENO_CHEM_TOXIC = 1), - "pacid" = list(XENO_CHEM_TOXIC = 2), - "chlorine" = list(XENO_CHEM_TOXIC = 0.5), - "ammonia" = list(XENO_CHEM_TOXIC = 0.5), - "sodawater" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1), - "beer" = list(XENO_CHEM_NUTRI = 0.6), - "diethylamine" = list(XENO_CHEM_NUTRI = 0.9), - "sugar" = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2), - "eznutrient" = list(XENO_CHEM_NUTRI = 0.8), - "cryoxadone" = list(XENO_CHEM_TOXIC = 0.4), - "flourine" = list(XENO_CHEM_TOXIC = 0.1), - "robustharvest" = list(XENO_CHEM_NUTRI = 1.5), - "glucose" = list(XENO_CHEM_NUTRI = 0.5), - "blood" = list(XENO_CHEM_NUTRI = 0.75, XENO_CHEM_TOXIC = 0.05, XENO_CHEM_MUT = 0.45), - "fuel" = list(XENO_CHEM_TOXIC = 0.4), - "toxin" = list(XENO_CHEM_TOXIC = 0.5), - "carpotoxin" = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5), - REAGENT_ID_PHORON = list(XENO_CHEM_TOXIC = 1.5, XENO_CHEM_MUT = 0.03), - "virusfood" = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32), - "cyanide" = list(XENO_CHEM_TOXIC = 3.5), - "slimejelly" = list(XENO_CHEM_NUTRI = 0.5), - "amutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1.5, XENO_CHEM_MUT = 3), - "mutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1, XENO_CHEM_MUT = 1.5), - "gold" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_NUTRI = 0.7, XENO_CHEM_MUT = 0.3), - "uranium" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_TOXIC = 0.7, XENO_CHEM_MUT = 1.2), - "glycerol" = list(XENO_CHEM_NUTRI = 0.6), - "woodpulp" = list(XENO_CHEM_HEAL = 0.1, XENO_CHEM_NUTRI = 0.7), - "docilitytoxin" = list(XENO_CHEM_NUTRI = 0.3) ) -re.id == "protein" || re.id == "glucose" || re.id == "fishbait") -liquid_protean -peanutoil -cornoil -durianpaste - if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice")) - descriptors |= "sweet" - if(reagents.has_reagent("anti_toxin")) - descriptors |= "astringent" - if(reagents.has_reagent("frostoil")) - descriptors |= "numbing" - if(reagents.has_reagent(REAGENT_ID_NUTRIMENT)) - descriptors |= "nutritious" - if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin")) - descriptors |= "spicy" - if(reagents.has_reagent("coco")) - descriptors |= "bitter" - if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice")) - descriptors |= "sweet-sour" - if(reagents.has_reagent("radium") || reagents.has_reagent("uranium")) - descriptors |= "radioactive" - if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin")) - descriptors |= "poisonous" - if(reagents.has_reagent("psilocybin") || reagents.has_reagent("bliss") || reagents.has_reagent("earthsblood")) - descriptors |= "hallucinogenic" - if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood")) - descriptors |= "medicinal" - if(reagents.has_reagent("gold") || reagents.has_reagent("earthsblood")) - descriptors |= "shiny" - if(reagents.has_reagent("lube")) - descriptors |= "slippery" - if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid")) - descriptors |= "acidic" - - var/static/list/toxic_reagents = list( - "anti_toxin" = -2, - "toxin" = 2, - REAGENT_ID_FLUORINE = 2.5, - "chlorine" = 1.5, - "sacid" = 1.5, - "pacid" = 3, - "plantbgone" = 3, - "cryoxadone" = -3, - "radium" = 2 - ) - var/static/list/nutrient_reagents = list( - "milk" = 0.1, - "beer" = 0.25, - "phosphorus" = 0.1, - "sugar" = 0.1, - "sodawater" = 0.1, - "ammonia" = 1, - "diethylamine" = 2, - REAGENT_ID_NUTRIMENT = 1, - "adminordrazine" = 1, - "eznutrient" = 1, - "robustharvest" = 1, - "left4zed" = 1 - ) - var/static/list/weedkiller_reagents = list( - REAGENT_ID_FLUORINE = -4, - "chlorine" = -3, - "phosphorus" = -2, - "sugar" = 2, - "sacid" = -2, - "pacid" = -4, - "plantbgone" = -8, - "adminordrazine" = -5 - ) - var/static/list/pestkiller_reagents = list( - "sugar" = 2, - "diethylamine" = -2, - "adminordrazine" = -5 - ) - var/static/list/water_reagents = list( - "water" = 1, - "adminordrazine" = 1, - "milk" = 0.9, - "beer" = 0.7, - REAGENT_ID_FLUORINE = -0.5, - "chlorine" = -0.5, - "phosphorus" = -0.5, - "water" = 1, - "sodawater" = 1, - ) - - // Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order). - var/static/list/beneficial_reagents = list( - "beer" = list( -0.05, 0, 0 ), - REAGENT_ID_FLUORINE = list( -2, 0, 0 ), - "chlorine" = list( -1, 0, 0 ), - "phosphorus" = list( -0.75, 0, 0 ), - "sodawater" = list( 0.1, 0, 0 ), - "sacid" = list( -1, 0, 0 ), - "pacid" = list( -2, 0, 0 ), - "plantbgone" = list( -2, 0, 0.2), - "cryoxadone" = list( 3, 0, 0 ), - "ammonia" = list( 0.5, 0, 0 ), - "diethylamine" = list( 1, 0, 0 ), - REAGENT_ID_NUTRIMENT = list( 0.5, 0.1, 0 ), - "radium" = list( -1.5, 0, 0.2), - "adminordrazine" = list( 1, 1, 1 ), - "robustharvest" = list( 0, 0.2, 0 ), - "left4zed" = list( 0, 0, 0.2) - ) - - // Mutagen list specifies minimum value for the mutation to take place, rather - // than a bound as the lists above specify. - var/static/list/mutagenic_reagents = list( - "radium" = 8, - "mutagen" = 15 - ) diff --git a/code/datums/diseases/choreomania.dm b/code/datums/diseases/choreomania.dm index 9fd41c4cd6..01802a7801 100644 --- a/code/datums/diseases/choreomania.dm +++ b/code/datums/diseases/choreomania.dm @@ -2,8 +2,8 @@ name = "Choreomania" max_stages = 3 spread_text = "Airborne" - cure_text = "Adranol" - cures = list("adranol") + cure_text = REAGENT_ADRANOL + cures = list(REAGENT_ID_ADRANOL) cure_chance = 10 agent = "TAP-DAnC3" viable_mobtypes = list(/mob/living/carbon/human) diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm index ca36f57d87..5edce81b0f 100644 --- a/code/datums/diseases/fake_gbs.dm +++ b/code/datums/diseases/fake_gbs.dm @@ -4,7 +4,7 @@ spread_text = "On contact" spread_flags = CONTACT_GENERAL cure_text = "Adranol & Sulfur" - cures = list("adranol", "sulfur") + cures = list(REAGENT_ID_ADRANOL, "sulfur") agent = "Gravitokinetic Bipotential SADS-" viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey) desc = "if left untreated death will occur." diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm index ea2c755e27..d223274576 100644 --- a/code/datums/diseases/gbs.dm +++ b/code/datums/diseases/gbs.dm @@ -4,7 +4,7 @@ spread_text = "On contact" spread_flags = CONTACT_GENERAL cure_text = "Adranol & Sulfur" - cures = list("adranol", "sulfur") + cures = list(REAGENT_ID_ADRANOL, "sulfur") cure_chance = 15 agent = "Gravitokinetic Bipotential SADS+" viable_mobtypes = list(/mob/living/carbon/human) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 678513ec03..7e63f890b2 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -57,7 +57,7 @@ /obj/structure/dispenser/tgui_data(mob/user) var/list/data = list() data["oxygen"] = oxygentanks - data["plasma"] = phorontanks + data["phoron"] = phorontanks return data @@ -102,7 +102,7 @@ if(..()) return switch(action) - if("plasma") + if("phoron") var/obj/item/tank/phoron/tank = locate() in src if(tank && Adjacent(ui.user)) ui.user.put_in_hands(tank) diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm index 6efeffcbc0..c854c14d19 100644 --- a/code/modules/food/glass/bottle_potion.dm +++ b/code/modules/food/glass/bottle_potion.dm @@ -10,7 +10,7 @@ /obj/item/reagent_containers/glass/bottle/potion/greater_healing name = "greater healing potion" desc = "A small green bottle containing some thick red liquid that claims to rapidly heal injuries." - prefill = list("vermicetol" = 30) + prefill = list(REAGENT_ID_VERMICETOL = 30) /obj/item/reagent_containers/glass/bottle/potion/fire_resist name = "fire resistance potion" @@ -110,12 +110,12 @@ /obj/item/reagent_containers/glass/bottle/potion/truepolymorph name = "polymorph potion" desc = "A small green bottle containing some strange purple liquid that claims to transform the drinker." - prefill = list("polymorph" = 1) + prefill = list(REAGENT_ID_POLYMORPH = 1) /obj/item/reagent_containers/glass/bottle/potion/glamour name = "glamour potion" desc = "A small white potion, the perfectly white liquid inside moves in an almost gaseous manner, yet appears to produce reflections perfectly." - prefill = list("glamour" = 1) + prefill = list(REAGENT_ID_GLAMOUR = 1) //Failed potions @@ -147,7 +147,7 @@ /obj/item/reagent_containers/glass/bottle/potion/lipostipo name = "thick potion" desc = "A small green bottle containing some thick viscous liquid." - prefill = list("lipostipo" = 30) + prefill = list(REAGENT_ID_LIPOSTIPO = 30) /obj/item/reagent_containers/glass/bottle/potion/phoron name = "volatile potion" diff --git a/code/modules/food/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm index 0a3c4c11a6..8179250b7a 100644 --- a/code/modules/food/glass/bottle_vr.dm +++ b/code/modules/food/glass/bottle_vr.dm @@ -10,7 +10,7 @@ desc = "A small bottle. Vermicetol is an powerful analgesic medication and can be used to treat blunt trauma." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-4" - prefill = list("vermicetol" = 60) + prefill = list(REAGENT_ID_VERMICETOL = 60) /obj/item/reagent_containers/glass/bottle/keloderm name = "keloderm bottle" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 3a1fee4a88..98a52fe444 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -307,7 +307,7 @@ return //VOREStation Addition end: shadekin - if(reagents.has_reagent("prussian_blue")) //Prussian Blue temporarily stops radiation effects. + if(reagents.has_reagent(REAGENT_ID_PRUSSIANBLUE)) //Prussian Blue temporarily stops radiation effects. return var/damage = 0 @@ -452,7 +452,7 @@ // Begin long-term radiation effects // Loss of taste occurs at 100 (2Gy) and is handled in taste.dm // These are all done one after another, so duplication is not required. Someone at 400rads will have the 100&400 effects. - if(!radiation && accumulated_rads >= 100 && !reagents.has_reagent("prussian_blue")) //Let's not hit them with long term effects when they're actively being hit with rads. + if(!radiation && accumulated_rads >= 100 && !reagents.has_reagent(REAGENT_ID_PRUSSIANBLUE)) //Let's not hit them with long term effects when they're actively being hit with rads. if(!isSynthetic()) I = internal_organs_by_name[O_EYES] if(I) //Eye stuff diff --git a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm index 3027ae0b33..8942672c33 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm @@ -20,30 +20,30 @@ if(1 to 2) user.visible_message(span_danger("[user]'s fangs scrape across [target]'s cheek!")) to_chat(target, span_danger("Your face feels tingly!")) - target.bloodstr.add_reagent("numbenzyme",attack_damage) //Have to add this here, otherwise the swtich fails. + target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage) //Have to add this here, otherwise the swtich fails. if(3 to 4) user.visible_message(span_danger("[user]'s fangs pierce into [target]'s neck at an odd, awkward angle!")) to_chat(target, span_danger("Your neck feels like it's on fire before going numb!")) - target.bloodstr.add_reagent("numbenzyme",attack_damage) + target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage) if(5) user.visible_message(span_danger("[user] sinks \his [pick(attack_noun)] deep into [target]'s neck, causing the vein to bulge outwards at some type of chemical is pumped into it!")) to_chat(target, span_danger("Your neck feels like it's going to burst! Moments later, you simply can't feel your neck any longer, the numbness beginning to spread throughout your body!")) - target.bloodstr.add_reagent("numbenzyme",attack_damage) + target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage) else // ----- BODY ----- // switch(attack_damage) if(1 to 2) user.visible_message(span_danger("[user]'s fangs scrape across [target]'s [affecting.name]!")) to_chat(target, span_danger("Your [affecting.name] feels tingly!")) - target.bloodstr.add_reagent("numbenzyme",attack_damage) + target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage) if(3 to 4) user.visible_message(span_danger("[user]'s fangs pierce [pick("", "", "the side of")] [target]'s [affecting.name]!")) to_chat(target, span_danger("Your [affecting.name] feels like it's on fire before going numb!")) - target.bloodstr.add_reagent("numbenzyme",attack_damage) + target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage) if(5) user.visible_message(span_danger("[user]'s fangs sink deep into [target]'s [affecting.name], one of their veins bulging outwards from the sudden fluid pumped into it!")) to_chat(target, span_danger("Your [affecting.name] feels like it's going to burst! Moments later, you simply can't feel your [affecting.name] any longer, the numbness slowly spreading throughout your body!")) - target.bloodstr.add_reagent("numbenzyme",attack_damage) + target.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,attack_damage) /datum/unarmed_attack/claws/shadekin diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index bb17f937a6..4df56e47b0 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -173,7 +173,7 @@ H.trait_injection_reagents += REAGENT_ID_MICROCILLIN // get small H.trait_injection_reagents += REAGENT_ID_MACROCILLIN // get BIG H.trait_injection_reagents += REAGENT_ID_NORMALCILLIN // normal - H.trait_injection_reagents += "numbenzyme" // no feelings + H.trait_injection_reagents += REAGENT_ID_NUMBENZYME // no feelings H.trait_injection_reagents += REAGENT_ID_ANDROROVIR // -> MALE H.trait_injection_reagents += REAGENT_ID_GYNOROVIR // -> FEMALE H.trait_injection_reagents += REAGENT_ID_ANDROGYNOROVIR // -> PLURAL diff --git a/code/modules/nifsoft/software/10_combat.dm b/code/modules/nifsoft/software/10_combat.dm index 9ce840b612..dd0bc6f50f 100644 --- a/code/modules/nifsoft/software/10_combat.dm +++ b/code/modules/nifsoft/software/10_combat.dm @@ -35,7 +35,7 @@ /datum/nifsoft/painkillers/life() if((. = ..())) var/mob/living/carbon/human/H = nif.human - H.bloodstr.add_reagent("numbenzyme",0.5) + H.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,0.5) /datum/nifsoft/hardclaws name = "Bloodletters" diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm index 3e3e7eb9cc..2edf1d4d9c 100644 --- a/code/modules/reagents/reactions/instant/instant_vr.dm +++ b/code/modules/reagents/reactions/instant/instant_vr.dm @@ -142,38 +142,38 @@ /////////////////////////////////////////////////////////////////////////////////// /// Other Drugs /decl/chemical_reaction/instant/adranol - name = "Adranol" - id = "adranol" - result = "adranol" + name = REAGENT_ADRANOL + id = REAGENT_ID_ADRANOL + result = REAGENT_ID_ADRANOL required_reagents = list("milk" = 2, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_POTASSIUM = 1) result_amount = 3 /decl/chemical_reaction/instant/vermicetol - name = "Vermicetol" - id = "vermicetol" - result = "vermicetol" + name = REAGENT_VERMICETOL + id = REAGENT_ID_VERMICETOL + result = REAGENT_ID_VERMICETOL required_reagents = list("bicaridine" = 2, REAGENT_ID_SHOCKCHEM = 1, REAGENT_ID_PHORON = 0.1) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 3 /decl/chemical_reaction/instant/prussian_blue - name = "Prussian Blue" - id = "prussian_blue" - result = "prussian_blue" + name = REAGENT_PRUSSIANBLUE + id = REAGENT_ID_PRUSSIANBLUE + result = REAGENT_ID_PRUSSIANBLUE required_reagents = list(REAGENT_ID_CARBON = 3, REAGENT_ID_IRON = 1, REAGENT_ID_NITROGEN = 3) result_amount = 7 /decl/chemical_reaction/instant/lipozilase - name = "Lipozilase" - id = "Lipozilase" - result = "lipozilase" + name = REAGENT_LIPOZILASE + id = REAGENT_ID_LIPOZILASE + result = REAGENT_ID_LIPOZILASE required_reagents = list("lipozine" = 1, "diethylamine" = 1) result_amount = 2 /decl/chemical_reaction/instant/lipostipo - name = "Lipostipo" - id = "Lipostipo" - result = "lipostipo" + name = REAGENT_LIPOSTIPO + id = REAGENT_ID_LIPOSTIPO + result = REAGENT_ID_LIPOSTIPO required_reagents = list("lipozine" = 1, REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_FLUORINE = 1) result_amount = 3 diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm index f5abd26dab..36783e4f61 100644 --- a/code/modules/reagents/reactions/instant/virology.dm +++ b/code/modules/reagents/reactions/instant/virology.dm @@ -9,7 +9,7 @@ name = REAGENT_ADRANOLVIRUSFOOD id = REAGENT_ID_ADRANOLVIRUSFOOD result = REAGENT_ID_ADRANOLVIRUSFOOD - required_reagents = list("adranol" = 1, "virusfood" = 1) + required_reagents = list(REAGENT_ID_ADRANOL = 1, "virusfood" = 1) result_amount = 1 /decl/chemical_reaction/instant/virus_food_phoron @@ -23,7 +23,7 @@ name = REAGENT_WEAKPHORONVIRUSFOOD id = REAGENT_ID_WEAKPHORONVIRUSFOOD result = REAGENT_ID_WEAKPHORONVIRUSFOOD - required_reagents = list("adranol" = 1, REAGENT_ID_PHORONVIRUSFOOD = 1) + required_reagents = list(REAGENT_ID_ADRANOL = 1, REAGENT_ID_PHORONVIRUSFOOD = 1) result_amount = 2 /decl/chemical_reaction/instant/virus_food_mutagen_sugar @@ -142,7 +142,7 @@ /decl/chemical_reaction/instant/mix_virus/rem_virus name = "Devolve Virus" id = "remvirus" - required_reagents = list("adranol" = 1) + required_reagents = list(REAGENT_ID_ADRANOL = 1) catalysts = list(REAGENT_ID_BLOOD = 1) /decl/chemical_reaction/instant/mix_virus/rem_virus/on_reaction(var/datum/reagents/holder) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 14a7708260..4944a18e63 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -249,7 +249,7 @@ name = "purity hypo" desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at \ resolving viruses, infections, radiation, and genetic maladies." - filled_reagents = list("spaceacillin" = 4, "arithrazine" = 5, "prussian_blue" = 5, "ryetalyn" = 1) + filled_reagents = list("spaceacillin" = 4, "arithrazine" = 5, REAGENT_ID_PRUSSIANBLUE = 5, "ryetalyn" = 1) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain name = "pain hypo" diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm index f9605b9290..3a4fadc2f7 100644 --- a/code/modules/reagents/reagent_containers/pill_vr.dm +++ b/code/modules/reagents/reagent_containers/pill_vr.dm @@ -124,7 +124,7 @@ /obj/item/reagent_containers/pill/vermicetol/Initialize() . = ..() - reagents.add_reagent("vermicetol", 15) + reagents.add_reagent(REAGENT_ID_VERMICETOL, 15) color = reagents.get_color() /obj/item/reagent_containers/pill/healing_nanites @@ -144,7 +144,7 @@ /obj/item/reagent_containers/pill/sleevingcure/Initialize() . = ..() - reagents.add_reagent("sleevingcure", 1) + reagents.add_reagent(REAGENT_ID_SLEEVINGCURE, 1) color = reagents.get_color() /obj/item/reagent_containers/pill/airlock diff --git a/code/modules/reagents/reagents/medicine_vr.dm b/code/modules/reagents/reagents/medicine_vr.dm index ffffacd0a3..7cff09ee0c 100644 --- a/code/modules/reagents/reagents/medicine_vr.dm +++ b/code/modules/reagents/reagents/medicine_vr.dm @@ -1,6 +1,6 @@ /datum/reagent/adranol - name = "Adranol" - id = "adranol" + name = REAGENT_ADRANOL + id = REAGENT_ID_ADRANOL description = "A mild sedative that calms the nerves and relaxes the patient." taste_description = "milk" reagent_state = LIQUID @@ -18,8 +18,8 @@ M.make_jittery(min(-25*removed,0)) /datum/reagent/numbing_enzyme - name = "Numbing Enzyme" - id = "numbenzyme" + name = REAGENT_NUMBENZYME + id = REAGENT_ID_NUMBENZYME description = "Some sort of organic painkiller." taste_description = "sourness" reagent_state = LIQUID @@ -61,8 +61,8 @@ H.stuttering += 20 /datum/reagent/vermicetol - name = "Vermicetol" - id = "vermicetol" + name = REAGENT_VERMICETOL + id = REAGENT_ID_VERMICETOL description = "A potent chemical that treats physical damage at an exceptional rate." taste_description = "sparkles" taste_mult = 3 @@ -79,8 +79,8 @@ M.heal_organ_damage(8 * removed * chem_effective, 0) /datum/reagent/sleevingcure - name = "Kitsuhanan Cure" - id = "sleevingcure" + name = REAGENT_SLEEVINGCURE + id = REAGENT_ID_SLEEVINGCURE description = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery." taste_description = "chocolate peanut butter" taste_mult = 2 @@ -96,8 +96,8 @@ /datum/reagent/prussian_blue //We don't have iodine, so prussian blue we go. - name = "Prussian Blue" - id = "prussian_blue" + name = REAGENT_PRUSSIANBLUE + id = REAGENT_ID_PRUSSIANBLUE description = "Prussian Blue is an medication used to temporarily pause the effects of radiation poisoning to allow for treatment. Does not treat radiation sickness on its own." taste_description = "salt" reagent_state = SOLID @@ -113,8 +113,8 @@ M.adjustToxLoss(-10 * removed) /datum/reagent/lipozilase // The anti-nutriment that rapidly removes weight. - name = "Lipozilase" - id = "lipozilase" + name = REAGENT_LIPOZILASE + id = REAGENT_ID_LIPOZILASE description = "A chemical compound that causes a dangerously powerful fat-burning reaction." taste_description = "blandness" reagent_state = LIQUID @@ -127,8 +127,8 @@ M.weight -= 0.3 /datum/reagent/lipostipo // The drug that rapidly increases weight. - name = "Lipostipo" - id = "lipostipo" + name = REAGENT_LIPOSTIPO + id = REAGENT_ID_LIPOSTIPO description = "A chemical compound that causes a dangerously powerful fat-adding reaction." taste_description = "blubber" reagent_state = LIQUID @@ -141,8 +141,8 @@ M.weight += 0.3 /datum/reagent/polymorph - name = "Transforitine" - id = "polymorph" + name = REAGENT_POLYMORPH + id = REAGENT_ID_POLYMORPH description = "A chemical that instantly transforms the consumer into another creature." taste_description = "luck" reagent_state = LIQUID @@ -315,8 +315,8 @@ return new_mob /datum/reagent/glamour - name = "Glamour" - id = "glamour" + name = REAGENT_GLAMOUR + id = REAGENT_ID_GLAMOUR description = "This material is from somewhere else, just being near produces changes." taste_description = "change" reagent_state = LIQUID diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 562052241a..3c8dabaeca 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -626,7 +626,7 @@ var/mob/living/carbon/human/Pred = owner if(ishuman(M)) var/mob/living/carbon/human/Prey = M - Prey.bloodstr.del_reagent("numbenzyme") + Prey.bloodstr.del_reagent(REAGENT_ID_NUMBENZYME) Prey.bloodstr.trans_to_holder(Pred.bloodstr, Prey.bloodstr.total_volume, 0.5, TRUE) // Copy=TRUE because we're deleted anyway Prey.ingested.trans_to_holder(Pred.bloodstr, Prey.ingested.total_volume, 0.5, TRUE) // Therefore don't bother spending cpu Prey.touching.trans_to_holder(Pred.bloodstr, Prey.touching.total_volume, 0.5, TRUE) // On updating the prey's reagents diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 95ee35c879..a866b3a805 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -164,8 +164,8 @@ //Numbing flag if(mode_flags & DM_FLAG_NUMBING) - if(H.bloodstr.get_reagent_amount("numbenzyme") < 2) - H.bloodstr.add_reagent("numbenzyme",4) + if(H.bloodstr.get_reagent_amount(REAGENT_ID_NUMBENZYME) < 2) + H.bloodstr.add_reagent(REAGENT_ID_NUMBENZYME,4) //Thickbelly flag if((mode_flags & DM_FLAG_THICKBELLY) && !H.muffled) diff --git a/tgui/packages/tgui/interfaces/TankDispenser.tsx b/tgui/packages/tgui/interfaces/TankDispenser.tsx index 580407c6f1..8346776a84 100644 --- a/tgui/packages/tgui/interfaces/TankDispenser.tsx +++ b/tgui/packages/tgui/interfaces/TankDispenser.tsx @@ -3,13 +3,13 @@ import { Button, LabeledList, Section } from '../components'; import { Window } from '../layouts'; type Data = { - plasma; - oxygen; + phoron: number; + oxygen: number; }; export const TankDispenser = (props) => { const { act, data } = useBackend(); - const { plasma, oxygen } = data; + const { phoron, oxygen } = data; return ( @@ -19,15 +19,15 @@ export const TankDispenser = (props) => { label="Phoron" buttons={ } > - {plasma} + {phoron}