From d172988a8ded28326eba892d186f4f54cb05d88d Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:40:28 +1100 Subject: [PATCH] Chemical Synthesis Kit (#22631) * add * locale * probably fix * fix stuffs * oversight * uh yea * i beg * tag * i pray to god this fixes it * update * fix * vestine * fix note * balancing * fix * toxin wipe --- .../Locale/en-US/reagents/meta/medicine.ftl | 4 +- .../Locale/en-US/reagents/meta/toxins.ftl | 6 +++ .../Locale/en-US/store/uplink-catalog.ftl | 7 ++- .../Catalog/Fills/Boxes/syndicate.yml | 21 +++++++++ .../Prototypes/Catalog/uplink_catalog.yml | 11 +++++ .../Objects/Specific/Medical/healing.yml | 13 ++++++ .../Objects/Specific/Medical/randompill.yml | 5 ++- .../Objects/Specific/chemistry-vials.yml | 15 +++++++ Resources/Prototypes/Reagents/fun.yml | 4 +- Resources/Prototypes/Reagents/medicine.yml | 10 ++--- Resources/Prototypes/Reagents/toxins.yml | 42 ++++++++++++++++- .../Recipes/Reactions/chemicals.yml | 45 +++++++++++++++++-- .../Prototypes/Recipes/Reactions/fun.yml | 2 +- .../Prototypes/Recipes/Reactions/medicine.yml | 2 + 14 files changed, 166 insertions(+), 21 deletions(-) diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl index 62854196ac..8d5e8940c9 100644 --- a/Resources/Locale/en-US/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl @@ -26,10 +26,10 @@ reagent-name-dexalin = dexalin reagent-desc-dexalin = Used for treating minor oxygen deprivation. A required reagent for dexalin plus. reagent-name-dexalin-plus = dexalin plus -reagent-desc-dexalin-plus = Used in treatment of extreme cases of oxygen deprivation and bloodloss. Flushes lexorin out the blood stream. +reagent-desc-dexalin-plus = Used in treatment of extreme cases of oxygen deprivation and bloodloss. Flushes heartbreaker toxin out of the blood stream. reagent-name-epinephrine = epinephrine -reagent-desc-epinephrine = An effective stabilizing chemical used to keep a critical person from dying to asphyxiation while patching up minor damage during crit. Flushes lexorin out the blood stream at the cost of more epinephrine, but may add histamine. Helps reduce stun time. Commonly found in the form of emergency medipens. +reagent-desc-epinephrine = An effective stabilizing chemical used to keep a critical person from dying to asphyxiation while patching up minor damage during crit. Flushes heartbreaker toxin out the blood stream at the cost of more epinephrine, but may add histamine. Helps reduce stun time. Commonly found in the form of emergency medipens. reagent-name-hyronalin = hyronalin reagent-desc-hyronalin = A weak treatment for radiation damage. A precursor to arithrazine and phalanximine. Can cause vomitting. diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl index bbc9817b30..72c576966e 100644 --- a/Resources/Locale/en-US/reagents/meta/toxins.ftl +++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl @@ -66,3 +66,9 @@ reagent-desc-lead = A slow-acting but incredibly lethal toxin found in steel, al reagent-name-bungotoxin = bungotoxin reagent-desc-bungotoxin = A moderately slow-acting poison found within the pit of the bungo fruit. + +reagent-name-vestine = vestine +reagent-desc-vestine = Has an adverse reaction within the body causing major jittering. While not particularly useful on it's own, it can be used to produce a small variety of chemicals. + +reagent-name-tazinide = tazinide +reagent-desc-tazinide = A highly dangerous metallic mixture which can interfere with most movement through an electrifying current. diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index a016d791d7..3021ca7d17 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -155,7 +155,6 @@ uplink-dna-scrambler-implanter-desc = A single use implant that can be activated uplink-emp-implanter-name = EMP Implanter uplink-emp-implanter-desc = Detonates a small EMP pulse on activation that drains nearby electronics of their power, can be used three times before the internal battery runs out. - uplink-macro-bomb-implanter-name = Macro Bomb Implanter uplink-macro-bomb-implanter-desc = Inject this and on death you'll create a large explosion. Huge team casualty cost, use at own risk. Replaces internal micro bomb. @@ -175,6 +174,9 @@ uplink-micro-bomb-implanter-desc = Explode on death or manual activation with th uplink-emp-kit-name = Electrical Disruptor Kit uplink-emp-kit-desc = The ultimate reversal on energy-based weaponry: Disables disablers, stuns stunbatons, discharges laser guns! Contains 3 EMP grenades and an EMP implanter. Note: Does not disrupt actual firearms. +uplink-chemistry-kit-name = Chemical Synthesis Kit +uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs! + uplink-meds-bundle-name = Medical Bundle uplink-meds-bundle-desc = All you need to get your comrades back in the fight: mainly a combat medkit, a defibrillator and three combat medipens. @@ -302,9 +304,6 @@ uplink-soap-desc = An untrustworthy bar of soap. Smells of fear. uplink-ultrabright-lantern-name = Extra-Bright Lantern uplink-ultrabright-lantern-desc = It can be used to blind people like a flash. -uplink-nocturine-chemistry-bottle-name = Nocturine Bottle -uplink-nocturine-chemistry-bottle-desc = A chemical that makes it very hard for your target to stand up. - uplink-combat-medkit-name = Combat Medical Kit uplink-combat-medkit-desc = A medkit made for fixing combat injuries. diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml index a6c3ca0d6a..0f1bd0f465 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml @@ -10,3 +10,24 @@ amount: 3 - id: EmpImplanter amount: 1 + +- type: entity + parent: BoxVial + id: ChemicalSynthesisKit + name: chemical synthesis kit + description: A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs! + components: + - type: Storage + grid: + - 0,0,3,2 + - type: StorageFill + contents: + - id: Beaker + amount: 2 + - id: Dropper + # It would be cool to have special "syndicate" chemical analysis goggles + - id: ClothingEyesGlassesChemical + - id: VestineChemistryVial + amount: 2 + - id: BaseChemistryEmptyVial + - id: SyringeStimulants diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 274b5a4773..8a5b51d65f 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -720,6 +720,17 @@ components: - SurplusBundle +- type: listing + id: UplinkChemistryKitBundle + name: uplink-chemistry-kit-name + description: uplink-chemistry-kit-desc + icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: vials } + productEntity: ChemicalSynthesisKit + cost: + Telecrystal: 4 + categories: + - UplinkBundles + - type: listing id: UplinkMedsBundle name: uplink-meds-bundle-name diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 4670f5fea3..97f8853604 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -770,3 +770,16 @@ reagents: - ReagentId: Romerol Quantity: 15 + +- type: entity + name: stimulants syringe + parent: BaseSyringe + id: SyringeStimulants + components: + - type: SolutionContainerManager + solutions: + injector: + maxVol: 15 + reagents: + - ReagentId: Stimulants + Quantity: 15 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index 2809388353..ccb4f6ca4e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -41,7 +41,10 @@ weight: 5 reagents: - SpaceDrugs - - Toxin + - quantity: 10 + weight: 5 + reagents: + - Amatoxin - type: entity name: strange pill diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml index 35ac6bcad2..1091fadaa4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml @@ -93,3 +93,18 @@ acts: [ "Destruction" ] - type: Spillable solution: drink + +- type: entity + id: VestineChemistryVial + name: vestine vial + parent: BaseChemistryEmptyVial + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Vestine + Quantity: 30 + - type: Tag + tags: [] diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index f22dfc1b8a..fe6a5f6f81 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -1,4 +1,4 @@ -- type: reagent +- type: reagent id: Carpetium name: reagent-name-carpetium group: Special @@ -165,7 +165,7 @@ Poison: effects: - !type:Electrocute - probability: 0.5 + probability: 0.35 - type: reagent id: Razorium diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index a305486830..c232e5a582 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -285,9 +285,9 @@ - !type:AdjustReagent conditions: - !type:ReagentThreshold - reagent: Lexorin + reagent: HeartbreakerToxin min: 1 - reagent: Lexorin + reagent: HeartbreakerToxin amount: -3 - !type:HealthChange conditions: @@ -334,12 +334,12 @@ Asphyxiation: 1 Poison: 1 - !type:AdjustReagent - reagent: Lexorin + reagent: HeartbreakerToxin amount: -2 - !type:AdjustReagent conditions: - !type:ReagentThreshold - reagent: Lexorin + reagent: min: 1 reagent: Epinephrine amount: -1 @@ -347,7 +347,7 @@ probability: 0.1 conditions: - !type:ReagentThreshold - reagent: Lexorin + reagent: HeartbreakerToxin min: 1 reagent: Histamine amount: 4 diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 57ea867efa..ea0446523f 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -285,7 +285,7 @@ - !type:HealthChange damage: types: - Asphyxiation: 2 + Asphyxiation: 5 plantMetabolism: - !type:PlantAdjustToxins amount: 10 @@ -303,7 +303,7 @@ - !type:HealthChange damage: groups: - Airloss: 7 + Airloss: 10 - type: reagent id: MindbreakerToxin @@ -578,3 +578,41 @@ damage: types: Poison: 1.8 + +- type: reagent + id: Vestine + name: reagent-name-vestine + group: Toxins + desc: reagent-desc-vestine + physicalDesc: reagent-physical-desc-shiny + flavor: medicine + color: "#435166" + metabolisms: + Poison: + effects: + - !type:Jitter + conditions: + - !type:ReagentThreshold + min: 5 + - !type:MovespeedModifier + walkSpeedModifier: 0.8 + sprintSpeedModifier: 0.8 + - !type:HealthChange + damage: + groups: + Airloss: 2 + +- type: reagent + id: Tazinide + name: reagent-name-tazinide + group: Toxins + desc: reagent-desc-tazinide + physicalDesc: reagent-physical-desc-metallic + flavor: shocking + color: "#FDD023" + metabolisms: + Poison: + effects: + - !type:Electrocute + probability: 0.8 + diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index 38dc4ff056..54d67ebc67 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -296,6 +296,20 @@ products: Desoxyephedrine: 4 #I kinda remember having to heat this up, and if you heated it up too much, it went boom, I can't remember the specific values tho. +- type: reaction + id: Stimulants + impact: Medium + minTemp: 370 + reactants: + Ephedrine: + amount: 1 + Vestine: + amount: 1 + Oxygen: + amount: 2 + products: + Stimulants: 2 + - type: reaction id: Ephedrine impact: Medium @@ -314,13 +328,14 @@ - type: reaction id: MuteToxin impact: Medium + minTemp: 370 reactants: Uranium: - amount: 2 - Water: - amount: 1 - Carbon: amount: 1 + Vestine: + amount: 2 + SpaceGlue: + amount: 2 products: MuteToxin: 2 @@ -424,3 +439,25 @@ amount: 1 products: SodiumPolyacrylate: 4 + +- type: reaction + id: Nocturine + impact: High + reactants: + Impedrezene: + amount: 2 + Vestine: + amount: 1 + products: + Nocturine: 1 + +- type: reaction + id: Tazinide + impact: Medium + reactants: + Licoxide: + amount: 1 + Vestine: + amount: 1 + products: + Tazinide: 1 diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml index eb895a31f2..594518514e 100644 --- a/Resources/Prototypes/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/Recipes/Reactions/fun.yml @@ -1,4 +1,4 @@ -- type: reaction +- type: reaction id: Carpetium reactants: SpaceDrugs: diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index ff53c05115..4862f082f4 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -284,6 +284,8 @@ amount: 1 Plasma: amount: 1 + Vestine: + amount: 1 products: Lexorin: 2 -- 2.51.2