diff --git a/Resources/Locale/en-US/_DV/guidebook/guides.ftl b/Resources/Locale/en-US/_DV/guidebook/guides.ftl index 775268c738..02c2a63a9d 100644 --- a/Resources/Locale/en-US/_DV/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_DV/guidebook/guides.ftl @@ -30,3 +30,5 @@ guide-entry-justice = Justice guide-entry-glimmer-creatures = Glimmer Creatures guide-entry-trade-station = Trade Station + +guide-entry-frequently-used-chemicals = Frequently Used Chemicals diff --git a/Resources/Locale/en-US/_Floof/reagents/meta/medicine.ftl b/Resources/Locale/en-US/_Floof/reagents/meta/medicine.ftl index 5b8559558d..41f654ff32 100644 --- a/Resources/Locale/en-US/_Floof/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/_Floof/reagents/meta/medicine.ftl @@ -1,6 +1,3 @@ -reagent-name-salicylicacid = salicylic acid -reagent-desc-salicylicacid = A powdery substance used for dermatological treatments. - reagent-name-traumoxadone = traumoxadone reagent-desc-traumoxadone = A cryogenics chemical. Used to treat severe trauma via regeneration of the damaged tissue. Works regardless of the patient being alive or dead. diff --git a/Resources/Locale/en-US/_Funkystation/entities/objects/consumable/food/baked/bagel.ftl b/Resources/Locale/en-US/_Funkystation/entities/objects/consumable/food/baked/bagel.ftl new file mode 100644 index 0000000000..f166485985 --- /dev/null +++ b/Resources/Locale/en-US/_Funkystation/entities/objects/consumable/food/baked/bagel.ftl @@ -0,0 +1,2 @@ +ent-FoodBagelPoppy = poppy seed bagel + .desc = A delicious bagel topped with poppy seeds. diff --git a/Resources/Locale/en-US/_Funkystation/guidebook/guides.ftl b/Resources/Locale/en-US/_Funkystation/guidebook/guides.ftl new file mode 100644 index 0000000000..7b3f97e513 --- /dev/null +++ b/Resources/Locale/en-US/_Funkystation/guidebook/guides.ftl @@ -0,0 +1 @@ +guide-entry-exotic = Exotic diff --git a/Resources/Locale/en-US/_Funkystation/reagents/meta/consumable/food/ingredients.ftl b/Resources/Locale/en-US/_Funkystation/reagents/meta/consumable/food/ingredients.ftl new file mode 100644 index 0000000000..af9415fb08 --- /dev/null +++ b/Resources/Locale/en-US/_Funkystation/reagents/meta/consumable/food/ingredients.ftl @@ -0,0 +1,2 @@ +reagent-name-liquidpie = liquid pie +reagent-desc-liquidpie = Pulped banana cream pie. diff --git a/Resources/Locale/en-US/_Funkystation/reagents/meta/exotics.ftl b/Resources/Locale/en-US/_Funkystation/reagents/meta/exotics.ftl new file mode 100644 index 0000000000..eaa82d4058 --- /dev/null +++ b/Resources/Locale/en-US/_Funkystation/reagents/meta/exotics.ftl @@ -0,0 +1,17 @@ +reagent-name-exotic = liquid exotium +reagent-desc-exotic = A precursor to many different rare chemicals. Use wisely. + +reagent-name-stasicillin = stasicillin +reagent-desc-stasicillin = A very rare chemical used by both top-level medbays and Nanotrasen secret agents. + +reagent-name-negacordrazine = negacordrazine +reagent-desc-negacordrazine = A strange, completely reversed tricordrazine. Heals nearly all damage types above 30 damage. + +reagent-name-stabilisedstimulants = stabilised stimulants +reagent-desc-stabilisedstimulants = You have zero clue what this is, but it really gets you going! + +reagent-name-revivopine = revivopine +reagent-desc-revivopine = An extremely effective medicine for combat purposes of getting fellow combatants up quickly. + +reagent-name-corgium = corgium +reagent-desc-corgium = A strange chemical imbued with the power to create life, specifically the cutest! diff --git a/Resources/Locale/en-US/_Funkystation/reagents/meta/medicine.ftl b/Resources/Locale/en-US/_Funkystation/reagents/meta/medicine.ftl new file mode 100644 index 0000000000..968d31dc81 --- /dev/null +++ b/Resources/Locale/en-US/_Funkystation/reagents/meta/medicine.ftl @@ -0,0 +1,47 @@ +reagent-name-libital = libital +reagent-desc-libital = A common but weak medicine used to heal brute trauma. Usually paired with other chemicals. + +reagent-name-probital = probital +reagent-desc-probital = A common analgesic that is effective at treating general brute trauma, at the cost of slowing you down. + +reagent-name-salicylicacid = salicylic acid +reagent-desc-salicylicacid = A heavy-duty analgesic that stabilizes the severely beaten, but is barely effective on people with less wounds. However, overdosing will reverse the effect. + +reagent-name-aiuri = aiuri +reagent-desc-aiuri = A common, but weak medicine used to heal brute injuries. Usually paired with other chemicals. + +reagent-name-lenturi = lenturi +reagent-desc-lenturi = A common chemical that is effective at treating burn damage by using the water inside your body. + +reagent-name-oxandrolone = oxandrolone +reagent-desc-oxandrolone = A heavy-duty chemical that stabilizes the severely burned, but is barely effective on people with less wounds. However, overdosing will reverse the effect. + +reagent-name-salbutamol = salbutamol +reagent-desc-salbutamol = A heavy-duty chemical that stabilizes the suffocated and reverses the effect of bloodloss, but is ineffective on people with less wounds. However, overdosing will reverse the effect. + +reagent-name-convermol = convermol +reagent-desc-convermol = A fast-acting asphyxiation medicine that has the side effect of putting heavy strain on the body, dose carefully. + +reagent-name-multiver = multiver +reagent-desc-multiver = A common antitoxin used to treat poison. + +reagent-name-penteticacid = pentetic acid +reagent-desc-penteticacid = A complicated anti-toxin solution that quickly flushes out toxins and heals the damage left behind. Overdose causes extreme pain. + +reagent-name-granibitulari = granibitulari +reagent-desc-granibitulari = A common, slow-acting medicine for all types of injuries. + +reagent-name-pielovene = pielovene +reagent-desc-pielovene = A honk-spectrum anti-toxin, which treats a broad variety of damage in clowns. Harmful to mimes. + +reagent-name-hypothium = hypothium +reagent-desc-hypothium = A difficult to synthesize drug used to cure most wounds and clot blood. + +reagent-name-pyroxadone = pyroxadone +reagent-desc-pyroxadone = A chemical that works inversely of cryoxadone, requiring high temperatures in order to work. Heals most damage. + +reagent-name-ardthyrnkole = ardthyrnkole +reagent-desc-ardthyrnkole = A pyrogenics chemical used to treat severe frostbite on corpses by rapidly defrosting and regenerating frozen tissue. + +reagent-name-natusixadone = natusixadone +reagent-desc-natusixadone = A pyrogenics chemical that burns away cancerous cells, regardless of if they are alive or dead. \ No newline at end of file diff --git a/Resources/Locale/en-US/_Funkystation/reagents/meta/toxins.ftl b/Resources/Locale/en-US/_Funkystation/reagents/meta/toxins.ftl new file mode 100644 index 0000000000..b5fdb9da8b --- /dev/null +++ b/Resources/Locale/en-US/_Funkystation/reagents/meta/toxins.ftl @@ -0,0 +1,11 @@ +reagent-name-heparin = heparin +reagent-desc-heparin = A fast-acting toxin that rapidly thins blood and opens wounds. + +reagent-name-rhigoxane = rhigoxane +reagent-desc-rhigoxane = A toxin that rapidly freezes anything it comes into contact with. + +reagent-name-spewium = spewium +reagent-desc-spewium = A chemical that rapidly causes the metabolizer to expel anything in their digestive system. + +reagent-name-pestiline = pestiline +reagent-desc-pestiline = A subtle, slow-acting toxin that damages the body on a cellular level. diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml index 28f4f4b578..2421ccddb8 100644 --- a/Resources/Prototypes/Body/Organs/Animal/animal.yml +++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml @@ -146,7 +146,7 @@ - type: Organ slotId: heart # Shitmed - type: Metabolizer - maxReagents: 2 + maxReagents: 3 # Funkychem - species metabolise 3 chems as a baseline metabolizerTypes: [ Animal ] groups: - id: Medicine diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml index 51171ddf58..8216dbbbcb 100644 --- a/Resources/Prototypes/Body/Organs/arachnid.yml +++ b/Resources/Prototypes/Body/Organs/arachnid.yml @@ -103,7 +103,7 @@ heldPrefix: heart - type: Metabolizer updateInterval: 1.5 - maxReagents: 2 + maxReagents: 3 # Funkychem - species metabolise 3 chems as a baseline metabolizerTypes: [Arachnid] groups: - id: Medicine diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml index bd19d42e0c..e65bf78b57 100644 --- a/Resources/Prototypes/Body/Organs/human.yml +++ b/Resources/Prototypes/Body/Organs/human.yml @@ -179,7 +179,7 @@ # This is done because these chemicals need to have some effect even if they aren't being filtered out of your body. # You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands. - type: Metabolizer - maxReagents: 2 + maxReagents: 3 # Funkychem - species metabolise 3 chems as a baseline metabolizerTypes: [Human] groups: - id: Medicine diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml index edf145b110..92d661ca28 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -10,6 +10,7 @@ - id: Ointment - id: Gauze - id: PillCanisterTricordrazine + - id: PillCanisterGranibitulari # Funkychem - tricordrazine variant # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents - type: entity @@ -60,7 +61,9 @@ - id: ClothingMaskBreathMedical - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - - id: SyringeInaprovaline + amount: 2 # Funkychem - more medipens in O2 kits + - id: SyringeConvermol # Funkychem - was inaprovaline + amount: 2 - id: PillCanisterDexalin - type: entity @@ -96,7 +99,7 @@ contents: - id: MedicatedSuture - id: RegenerativeMesh - - id: SyringeEphedrine + - id: SyringeRevivopine # Funkychem - revivopine is the dedicated combat chemical now - id: SyringeSaline - id: BruteAutoInjector - id: BurnAutoInjector diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml index 2b0fdfae6c..2c978b5670 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml @@ -21,6 +21,7 @@ - JugSilicon - JugSodium - JugSulfur + - JugWeldingFuel # Funkychem - welding fuel is used a lot more now - type: reagentDispenserInventory id: EmptyInventory diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml index a6f5fed206..0d400990d9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml @@ -1,14 +1,16 @@ - type: vendingMachineInventory id: ChemVendInventory startingInventory: - Jug: 4 + Jug: 8 # Funkychem - lots more intermediates - was 4 + BoxBottle: 1 # Funkychem - lots more intermediates + BoxBeaker: 1 # Funkychem - lots more intermediates JugAluminium: 2 JugCarbon: 4 JugChlorine: 1 JugCopper: 2 JugEthanol: 2 JugFluorine: 1 - JugHydrogen: 3 + JugHydrogen: 4 # Funkychem - more hydrogen consumed - was 3 JugIodine: 1 JugIron: 2 JugLithium: 2 @@ -22,24 +24,28 @@ JugSodium: 2 JugSugar: 3 JugSulfur: 1 + JugWeldingFuel: 1 # Funkychem - more welding fuel consumed contrabandInventory: DrinkLithiumFlask: 1 StrangePill: 3 emaggedInventory: ChemistryBottleToxin: 1 ChemistryBottleLead: 2 # DeltaV - Added lead to standard chemvend + BluespaceBeaker: 1 # Funkychem - let traitor chemists make nefarious batches - type: vendingMachineInventory id: ChemVendInventorySyndicate startingInventory: - Jug: 4 + Jug: 8 # Funkychem - lots more intermediates - was 4 + BoxBottle: 1 # Funkychem - lots more intermediates + BoxBeaker: 1 # Funkychem - lots more intermediates JugAluminium: 2 JugCarbon: 4 JugChlorine: 1 JugCopper: 2 JugEthanol: 2 JugFluorine: 1 - JugHydrogen: 3 + JugHydrogen: 4 # Funkychem - more hydrogen consumed - was 3 JugIodine: 1 JugIron: 2 JugLithium: 2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml index 114b3e01f2..3793ad8335 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml @@ -43,7 +43,7 @@ food: maxVol: 12 reagents: - - ReagentId: Bicaridine + - ReagentId: SalicylicAcid # Funkychem - bicaridine -> salicylic acid Quantity: 5 - ReagentId: Nutriment Quantity: 5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index b86a4201e8..691529ddb6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -192,6 +192,13 @@ - Fruit - Pie - Slice + # Funkychem + - type: Extractable + grindableSolutionName: food + juiceSolution: + reagents: + - ReagentId: LiquidPie + Quantity: 2 # Tastes like pie, cream, banana. - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index ee4c61ab7b..e0c14f81b2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -434,7 +434,8 @@ food: maxVol: 25 reagents: - - ReagentId: Bicaridine #keeping it somewhat consistent with the meat itself + # Funkychem - bicaridine -> salicylic acid + - ReagentId: SalicylicAcid #keeping it somewhat consistent with the meat itself Quantity: 7 - ReagentId: Vitamin Quantity: 12 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index c867912317..6c1c80261e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -302,7 +302,7 @@ solutions: food: reagents: - - ReagentId: Bicaridine + - ReagentId: SalicylicAcid # Funkychem - bicaridine -> salicylic acid Quantity: 20 - type: StaticPrice price: 750 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 0c79c233a4..8be6d04fb0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1542,7 +1542,7 @@ reagents: - ReagentId: Nutriment Quantity: 2 - - ReagentId: Bicaridine + - ReagentId: SalicylicAcid # Funkychem - bicaridine -> salicylic acid Quantity: 20 - type: Sprite sprite: Objects/Specific/Hydroponics/poppy.rsi @@ -1574,7 +1574,7 @@ reagents: - ReagentId: Nutriment Quantity: 2 - - ReagentId: Bicaridine + - ReagentId: SalicylicAcid # Funkychem - bicaridine -> salicylic acid Quantity: 20 - type: Sprite sprite: Objects/Specific/Hydroponics/lily.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml index 818e56a37a..d455dfc6e6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml @@ -201,7 +201,7 @@ reagents: - ReagentId: Nicotine Quantity: 10 - - ReagentId: Bicaridine + - ReagentId: SalicylicAcid # Funkychem - bicaridine -> salicylic acid Quantity: 10 - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 5837c503a9..5bd559bc73 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -434,7 +434,7 @@ name: airloss auto-injector parent: ChemicalMedipen id: AirlossAutoInjector - description: A rapid dose of saline and dexalin plus, intended to get someone up quickly. + description: A rapid dose of saline and salbutamol, intended to get someone up quickly. # Funkychem - dex+ -> salbutamol components: - type: Item inhandVisuals: @@ -465,12 +465,12 @@ - type: SolutionContainerManager solutions: pen: - maxVol: 40 + maxVol: 30 # Funkychem - was 40 reagents: - ReagentId: Saline - Quantity: 20 - - ReagentId: DexalinPlus - Quantity: 20 + Quantity: 15 # Funkychem - was 20 + - ReagentId: Salbutamol # Funkychem - was dex+ + Quantity: 15 # Funkychem - was 20 - type: Tag tags: [] diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index 941abd1a43..5b704c76b7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -7,15 +7,19 @@ weight: 5 reagents: - Stimulants + - StabilisedStimulants # Funkychem - exotic chems - quantity: 10 weight: 5 reagents: - Ichor - Necrosol + - Stasicillin # Funkychem - exotic chems + - Revivopine # Funkychem - exotic chems - quantity: 5 weight: 4 reagents: - Cognizine + - ExoticReagent # Funkychem - raw exotic chems - quantity: 10 weight: 1 reagents: @@ -31,6 +35,7 @@ - Vitamin - PolypyryliumOligomers - Charcoal + - Negacordrazine # Funkychem - decent chem # Neutral - weight: 20 - quantity: 20 weight: 17.5 @@ -85,6 +90,10 @@ - BuzzochloricBees - Amatoxin - Tazinide + - Heparin # Funkychem - new toxins + - Rhigoxane # Funkychem - new toxins + - Spewium # Funkychem - new toxins + - Pestiline # Funkychem - new toxins - quantity: 5 weight: 2.5 reagents: diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index 2f70744fb3..ce7a1ed38c 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -876,11 +876,13 @@ - Cryptobiolin - Dylovene - Arithrazine - - Bicaridine + - SalicylicAcid # Funkychem - bicaridine -> salicylic acid - Cryoxadone - Dermaline - Dexalin - - DexalinPlus + - Oxandrolone # Funkychem - oxandrolone + - Convermol # Funkychem - dex+ -> convermol + - Salbutamol # Funkychem - dex+ -> salbutamol - Epinephrine - Leporazine - Ambuzol @@ -905,6 +907,7 @@ - Honk - Carpetium - JuiceThatMakesYouWeh + - ExoticReagent # Funkychem - base for exotic chems - type: Drink solution: anomaly - type: DrainableSolution diff --git a/Resources/Prototypes/Guidebook/chemicals.yml b/Resources/Prototypes/Guidebook/chemicals.yml index 730d7b3045..0491b5a141 100644 --- a/Resources/Prototypes/Guidebook/chemicals.yml +++ b/Resources/Prototypes/Guidebook/chemicals.yml @@ -12,6 +12,7 @@ - Botanical - Biological - Special + - Exotic # Funkychem - Others filterEnabled: True diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml index d6413859b2..b584f489dd 100644 --- a/Resources/Prototypes/Guidebook/medical.yml +++ b/Resources/Prototypes/Guidebook/medical.yml @@ -32,6 +32,7 @@ # - Medicine # Duplicate guide entries are currently not supported # TODO GUIDEBOOK Maybe allow duplicate entries? + - FrequentlyUsedChemicals # DeltaV - better chemical guidebook - Botanicals - AdvancedBrute diff --git a/Resources/Prototypes/Hydroponics/randomChemicals.yml b/Resources/Prototypes/Hydroponics/randomChemicals.yml index 7b2fdf3a2c..b953755191 100644 --- a/Resources/Prototypes/Hydroponics/randomChemicals.yml +++ b/Resources/Prototypes/Hydroponics/randomChemicals.yml @@ -10,6 +10,7 @@ - Honk - BuzzochloricBees - Stimulants + - ExoticReagent # Funkychem - quantity: 5 weight: 1 reagents: @@ -31,6 +32,8 @@ - ChangelingSting - CogChamp - JuiceThatMakesYouWeh + - Convermol # Funkychem - decent medicine + - Pestiline # Funkychem - decent toxin - quantity: 5 weight: 2 reagents: @@ -62,6 +65,7 @@ reagents: - Bicaridine - Dermaline + - SalicylicAcid # Funkychem - Ephedrine - NorepinephricAcid - Tricordrazine @@ -95,7 +99,7 @@ weight: 3.5 reagents: - Vitamin - - Kelotane + - Dexalin # Funkychem - replace kelotane with dexalin, we already have burns elsewhere - Inaprovaline - Oil - Slime diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 54799ca1df..c64711a851 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1178,7 +1178,7 @@ Min: 1 Max: 2 PotencyDivisor: 50 - Bicaridine: + SalicylicAcid: # Funkychem - bicaridine -> salicylic acid Min: 1 Max: 20 PotencyDivisor: 5 @@ -1232,7 +1232,7 @@ Min: 1 Max: 2 PotencyDivisor: 50 - Bicaridine: + SalicylicAcid: # Funkychem - bicaridine -> salicylic acid Min: 1 Max: 20 PotencyDivisor: 5 diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index 6490e87ffb..c9f14532af 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -170,7 +170,7 @@ effects: - !type:SatiateThirst factor: 1.5 - # Dragon doesn't require airloss healing, so omnizine is still best for humans. + # Dragon doesn't require airloss healing, so omnizine is still best for humans. - Funkychem changes this, as chem if they have literal hours can make it. VERY hard. Medicine: effects: - !type:ModifyBloodLevel @@ -180,7 +180,8 @@ groups: Burn: -5 Brute: -5 - Toxin: -2 + Toxin: -4 # Funkychem - was -2 + Airloss: -6 # Funkychem - ichor does airloss now too types: Bloodloss: -5 - !type:ModifyBleedAmount diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 2bfc985943..c2be7f480f 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -285,6 +285,7 @@ - type: reagent id: DexalinPlus name: reagent-name-dexalin-plus + abstract: true # Funkychem - no more dex+ group: Medicine desc: reagent-desc-dexalin-plus physicalDesc: reagent-physical-desc-cloudy diff --git a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml index dae1cddd5e..b5b0b93686 100644 --- a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml @@ -33,4 +33,4 @@ MaterialCloth1: 1 reagents: Sigynate: 20 - Dermaline: 20 + Oxandrolone: 20 # Funkychem - dermaline -> oxandrolone for advanced topicals diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index a3986aa4d1..31a48a7499 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -50,7 +50,7 @@ Oxygen: amount: 1 products: - Acetone: 2 + Acetone: 3 # Funkychem - was 2 - type: reaction id: FoamingAgent @@ -277,7 +277,7 @@ Carbon: amount: 1 products: - Oil: 3 + Oil: 4 # Funkychem - should hopefully offset hydrogen use, was 3 - type: reaction id: Fluorosurfactant diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index a99015fe90..945fa8a997 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -113,24 +113,25 @@ products: Dexalin: 3 -- type: reaction - id: DexalinPlus - reactants: - Dexalin: - amount: 1 - Carbon: - amount: 1 - Iron: - amount: 1 - products: - DexalinPlus: 3 +# Funkychem - no more dex+ +# - type: reaction +# id: DexalinPlus +# reactants: +# Dexalin: +# amount: 1 +# Carbon: +# amount: 1 +# Iron: +# amount: 1 +# products: +# DexalinPlus: 3 - type: reaction id: Hyronalin reactants: Radium: amount: 1 - Dylovene: + PotassiumIodide: # Funkychem - no more dylovene + potassium iodide makes more sense here amount: 1 products: Hyronalin: 2 @@ -253,7 +254,7 @@ - type: reaction id: HeartbreakerToxin reactants: - DexalinPlus: + Salbutamol: # Funkychem - no more dex+ amount: 1 MindbreakerToxin: amount: 1 diff --git a/Resources/Prototypes/XenoArch/artifact_triggers.yml b/Resources/Prototypes/XenoArch/artifact_triggers.yml index ea2ea904c9..d4a22c9e51 100644 --- a/Resources/Prototypes/XenoArch/artifact_triggers.yml +++ b/Resources/Prototypes/XenoArch/artifact_triggers.yml @@ -126,7 +126,10 @@ groups: Acidic: [ Touch ] reactions: - - reagents: [ Dylovene, Diphenhydramine, Arithrazine, Bicaridine, Dermaline, Dexalin, DexalinPlus, Tricordrazine, Leporazine, Bruizine, Lacerinol, Puncturase, Pyrazine, Insuzine, Kelotane, Hyronalin, Inaprovaline, Epinephrine ] + # Funkychem - Oh god, the merge conflicts + - reagents: [ Dylovene, Diphenhydramine, Arithrazine, Bicaridine, Dermaline, Dexalin, Tricordrazine, Leporazine, Bruizine, Lacerinol, Puncturase, Pyrazine, Insuzine, Kelotane, Hyronalin, Inaprovaline, Epinephrine + , SalicylicAcid, Oxandrolone, Salbutamol, Convermol + ] methods: [ Touch ] effects: - !type:ActivateArtifact diff --git a/Resources/Prototypes/_DV/Body/Organs/feroxi.yml b/Resources/Prototypes/_DV/Body/Organs/feroxi.yml index 75d8e3eba9..cc1647f5dd 100644 --- a/Resources/Prototypes/_DV/Body/Organs/feroxi.yml +++ b/Resources/Prototypes/_DV/Body/Organs/feroxi.yml @@ -13,7 +13,7 @@ - Crayon - Paper - type: Metabolizer - maxReagents: 2 + maxReagents: 3 metabolizerTypes: [ Feroxi, Animal ] - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/_DV/Guidebook/medical.yml b/Resources/Prototypes/_DV/Guidebook/medical.yml new file mode 100644 index 0000000000..d7eb011169 --- /dev/null +++ b/Resources/Prototypes/_DV/Guidebook/medical.yml @@ -0,0 +1,4 @@ +- type: guideEntry + id: FrequentlyUsedChemicals + name: guide-entry-frequently-used-chemicals + text: "/ServerInfo/Guidebook/_DV/Medical/FrequentlyUsedChemicals.xml" diff --git a/Resources/Prototypes/_Floof/Reagents/chemicals.yml b/Resources/Prototypes/_Floof/Reagents/chemicals.yml deleted file mode 100644 index 29eb16dd71..0000000000 --- a/Resources/Prototypes/_Floof/Reagents/chemicals.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: reagent - id: SalicylicAcid - name: reagent-name-salicylicacid - desc: reagent-desc-salicylicacid - physicalDesc: reagent-physical-desc-powdery - color: "#EEEEEE" diff --git a/Resources/Prototypes/_Floof/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/_Floof/Recipes/Reactions/chemicals.yml deleted file mode 100644 index e973152cab..0000000000 --- a/Resources/Prototypes/_Floof/Recipes/Reactions/chemicals.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: reaction - id : SalicylicAcid - reactants: - Phenol: - amount: 1 - Sodium: - amount: 1 - Carbon: - amount: 1 - Oxygen: - amount: 1 - SulfuricAcid: - amount: 1 - products: - SalicylicAcid: 3 diff --git a/Resources/Prototypes/_Funkystation/Guidebook/chemicals.yml b/Resources/Prototypes/_Funkystation/Guidebook/chemicals.yml new file mode 100644 index 0000000000..03f23e3393 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Guidebook/chemicals.yml @@ -0,0 +1,5 @@ +- type: guideEntry + id: Exotic + name: guide-entry-exotic + text: "/ServerInfo/Funkystation/Guidebook/ChemicalTabs/Exotic.xml" + filterEnabled: True diff --git a/Resources/Prototypes/_Funkystation/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/_Funkystation/Objects/Specific/Medical/healing.yml new file mode 100644 index 0000000000..4de660ef6d --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Objects/Specific/Medical/healing.yml @@ -0,0 +1,62 @@ +- type: entity + suffix: convermol + parent: PrefilledSyringe + id: SyringeConvermol + components: + - type: Label + currentLabel: convermol + - type: SolutionContainerManager + solutions: + injector: + maxVol: 15 + reagents: + - ReagentId: Convermol + Quantity: 15 + +- type: entity + suffix: revivopine + parent: PrefilledSyringe + id: SyringeRevivopine + components: + - type: Label + currentLabel: revivopine + - type: SolutionContainerManager + solutions: + injector: + maxVol: 15 + reagents: + - ReagentId: Revivopine + Quantity: 15 + +- type: entity + name: pill + suffix: Granibitulari 20u # Takes like 5 minutes to fully heal at 15, 20 makes sense - Funkychem + parent: Pill + id: PillGranibitulari + components: + - type: Pill + pillType: 9 + - type: Sprite + state: pill3 + - type: Label + currentLabel: granibitulari 20u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Granibitulari + Quantity: 20 + +- type: entity + name: pill canister + parent: PillCanister + id: PillCanisterGranibitulari + suffix: Granibitulari 15u + components: + - type: Label + currentLabel: granibitulari 15u + - type: StorageFill + contents: + - id: PillGranibitulari + amount: 8 diff --git a/Resources/Prototypes/_Funkystation/Polymorphs/polymorph.yml b/Resources/Prototypes/_Funkystation/Polymorphs/polymorph.yml new file mode 100644 index 0000000000..5a75a3ce5a --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Polymorphs/polymorph.yml @@ -0,0 +1,10 @@ +- type: polymorph + id: CorgiMorph + configuration: + entity: MobCorgi + forced: true + inventory: None + transferName: true + transferDamage: true + revertOnCrit: false + revertOnDeath: false diff --git a/Resources/Prototypes/_Funkystation/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/_Funkystation/Reagents/Consumable/Food/ingredients.yml new file mode 100644 index 0000000000..3db72e4085 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Reagents/Consumable/Food/ingredients.yml @@ -0,0 +1,14 @@ +- type: reagent + id: LiquidPie + name: reagent-name-liquidpie + group: Foods + desc: reagent-desc-liquidpie + physicalDesc: reagent-physical-desc-sticky + flavor: sweet + color: "#c4ae70" + metabolisms: + Food: + effects: + - !type:AdjustReagent + reagent: Sugar + amount: 0.5 diff --git a/Resources/Prototypes/_Funkystation/Reagents/exotic.yml b/Resources/Prototypes/_Funkystation/Reagents/exotic.yml new file mode 100644 index 0000000000..a504b68742 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Reagents/exotic.yml @@ -0,0 +1,136 @@ +# add "group: Exotic" to put new exotic chemicals in the guidebook's tab +# For new chems: Exotic should only be strong gimmick / strong inverted chems / parts of said chems. + +- type: reagent + id: ExoticReagent + name: reagent-name-exotic + group: Exotic + desc: reagent-desc-exotic + physicalDesc: reagent-physical-desc-exotic-smelling + flavor: nothing + color: "#d111fc" + +- type: reagent + id: Stasicillin + name: reagent-name-stasicillin + group: Exotic + desc: reagent-desc-stasicillin + physicalDesc: reagent-physical-desc-crystalline + flavor: medicine + color: "#5c11fc" + metabolisms: + Medicine: + metabolismRate: 0.2 + effects: + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 11 + damage: + groups: + Airloss: -6 + Toxin: -4 + Brute: -4.5 + Burn: -6 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + min: 11 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + +- type: reagent + id: Negacordrazine + name: reagent-name-negacordrazine + group: Exotic + desc: reagent-desc-negacordrazine + physicalDesc: reagent-physical-desc-translucent + flavor: medicine + color: "#d34b26" + metabolisms: + Medicine: + metabolismRate: 0.2 + effects: + - !type:HealthChange + conditions: + - !type:TotalDamage + min: 30 + damage: + groups: + Airloss: -2 + Brute: -1.2 + Burn: -1.6 + Toxin: -2 + +- type: reagent + id: StabilisedStimulants + name: reagent-name-stabilisedstimulants + group: Exotic + desc: reagent-desc-stabilisedstimulants + physicalDesc: reagent-physical-desc-opaque + flavor: bitter + color: "#e1e1e1" + metabolisms: + Narcotic: + metabolismRate: 0.2 + effects: + - !type:MovespeedModifier + walkSpeedModifier: 1.35 + sprintSpeedModifier: 1.35 + - !type:GenericStatusEffect + key: Stun + time: 3 + type: Remove + - !type:GenericStatusEffect + key: KnockedDown + time: 3 + type: Remove + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Haloperidol + max: 0.01 + key: Drowsiness + time: 10 + type: Remove + +- type: reagent + id: Revivopine + name: reagent-name-revivopine + group: Exotic + desc: reagent-desc-revivopine + physicalDesc: reagent-physical-desc-exhilarating + flavor: medicine + color: "#04ea9a" + metabolisms: + Medicine: + metabolismRate: 2.0 + effects: + - !type:HealthChange + conditions: + - !type:TotalDamage + min: 90 # Heals a bit above crit # DeltaV - this brings people to a bit more stable condition + damage: + groups: # 5 Damage every type except rad/pois + Airloss: -10 + Brute: -15 + Burn: -20 + +- type: reagent + id: Corgium + name: reagent-name-corgium + group: Exotic + desc: reagent-desc-corgium + physicalDesc: reagent-physical-desc-fluffy + flavor: medicine + color: "#ffaa00" + metabolisms: + Poison: + effects: + - !type:Polymorph + prototype: CorgiMorph # PERMANENT. There's a reason this chem's an exotic chem, not a low-mid level chem. Exotic's primary toxin. + conditions: + - !type:ReagentThreshold + min: 20 diff --git a/Resources/Prototypes/_Funkystation/Reagents/medicine.yml b/Resources/Prototypes/_Funkystation/Reagents/medicine.yml new file mode 100644 index 0000000000..17534d38eb --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Reagents/medicine.yml @@ -0,0 +1,324 @@ +# burn +- type: reagent + id: Oxandrolone + name: reagent-name-oxandrolone + group: Medicine + desc: reagent-desc-oxandrolone + physicalDesc: reagent-physical-desc-translucent + flavor: medicine + color: "#e6e600" + metabolisms: + Medicine: + metabolismRate: 0.2 + effects: + - !type:HealthChange + conditions: + - !type:TotalDamage + max: 30 + damage: + types: + Heat: -0.2 + Shock: -0.2 + Cold: -0.2 + - !type:HealthChange + conditions: + - !type:TotalDamage + min: 30 + damage: + types: + Heat: -0.8 + Shock: -0.8 + Cold: -0.8 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 15.5 + damage: + types: # ODing should heal burn but cause other damage + Heat: -0.8 + Shock: -0.8 + Cold: -0.8 + Blunt: 2 + Piercing: 0.5 + - !type:Jitter + conditions: + - !type:ReagentThreshold + min: 15.5 + +# brute +- type: reagent + id: SalicylicAcid + name: reagent-name-salicylicacid + group: Medicine + desc: reagent-desc-salicylicacid + physicalDesc: reagent-physical-desc-mucus-like + flavor: medicine + color: "#f9e0e9" + metabolisms: + Medicine: + metabolismRate: 0.2 + effects: + - !type:HealthChange + conditions: + - !type:TotalDamage + max: 30 + damage: + groups: + Brute: -0.6 + - !type:HealthChange + conditions: + - !type:TotalDamage + min: 30 + damage: + groups: + Brute: -2.4 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 15.5 + damage: # ODing causes damage but heals brute + groups: + Burn: 2 # will cause minor caustic damage + Brute: -2.4 + - !type:Jitter + conditions: + - !type:ReagentThreshold + min: 15.5 + +# airloss +- type: reagent + id: Salbutamol + name: reagent-name-salbutamol + group: Medicine + desc: reagent-desc-salbutamol + physicalDesc: reagent-physical-desc-cloudy + flavor: medicine + color: "#99ffff" + metabolisms: + Medicine: + metabolismRate: 0.2 + effects: + - !type:HealthChange + conditions: + - !type:TotalDamage + min: 30 + damage: + groups: + Airloss: -6 + - !type:HealthChange + conditions: + - !type:TotalDamage + max: 30 + damage: + groups: + Airloss: -1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 15.5 + damage: + groups: # ODing heals airloss but causes damage + Airloss: -6 + types: # DeltaV - genetic is too evil + Caustic: 0.2 + +- type: reagent + id: Convermol + name: reagent-name-convermol + group: Medicine + desc: reagent-desc-convermol + physicalDesc: reagent-physical-desc-abrasive + flavor: medicine + color: "#e80d7e" + metabolisms: + Medicine: + metabolismRate: 1.0 + effects: + - !type:HealthChange + damage: + types: + Asphyxiation: -10 + Bloodloss: -4 # DeltaV - we want this to handle some bloodloss too + Blunt: 4 # After organ damage gets added, add lung damage and reduce to 2. + - !type:Jitter + +- type: reagent + id: Granibitulari + name: reagent-name-granibitulari + group: Medicine + desc: reagent-desc-granibitulari + physicalDesc: reagent-physical-desc-gloopy + flavor: medicine + color: "#c7e4e8" + metabolisms: + Medicine: + metabolismRate: 0.05 + effects: + - !type:HealthChange + damage: + groups: + Brute: -0.3 + types: + Poison: -0.1 + Heat: -0.1 + Shock: -0.1 + Cold: -0.1 + +# misc +- type: reagent + id: Pielovene + name: reagent-name-pielovene + group: Exotic + desc: reagent-desc-pielovene + physicalDesc: reagent-physical-desc-creamy + flavor: banana + color: "#f5d069" + metabolisms: + Medicine: + effects: + - !type:HealthChange + conditions: + - !type:JobCondition + job: + - Clown + damage: + groups: + Brute: -1 + Burn: -1 + Airloss: -1 + Toxin: -1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 1 + - !type:JobCondition + job: + - Mime + damage: + groups: + Brute: 2 + Airloss: 2 + Toxin: 2 + - !type:Jitter + conditions: + - !type:ReagentThreshold + min: 1 + - !type:JobCondition + job: + - Mime + - !type:PopupMessage + conditions: + - !type:ReagentThreshold + min: 1 + - !type:JobCondition + job: + - Mime + type: Local + visualType: Medium + messages: [ "generic-reagent-effect-nauseous" ] + probability: 0.2 + - !type:ChemVomit + conditions: + - !type:ReagentThreshold + min: 1 + - !type:JobCondition + job: + - Mime + probability: 0.02 + - !type:Drunk + conditions: + - !type:ReagentThreshold + min: 1 + - !type:JobCondition + job: + - Mime + +- type: reagent + id: Hypothium + name: reagent-name-hypothium + group: Exotic + desc: reagent-desc-hypothium + physicalDesc: reagent-physical-desc-tart + flavor: medicine + color: "#c8317a" + metabolisms: + Medicine: + metabolismRate: 0.2 + effects: + - !type:HealthChange + damage: # still less than healium as a gas but a good liquid chem + groups: + Brute: -4.5 + Burn: -4.5 + Toxin: -4.5 + Airloss: -6 + - !type:ModifyBleedAmount + amount: -0.5 + +# pyro +- type: reagent + id: Pyroxadone + name: reagent-name-pyroxadone + group: Medicine + desc: reagent-desc-pyroxadone + physicalDesc: reagent-physical-desc-fizzy + flavor: spicy + color: "#f8c8ba" + metabolisms: + Medicine: + effects: + - !type:HealthChange + conditions: + - !type:Temperature + min: 337.3 # completely arbitrary + damage: + groups: # same as cryox + Airloss: -6 + Brute: -4 + Burn: -6 + Toxin: -4 + types: + Heat: -3 + +- type: reagent + id: Ardthyrnkole + name: reagent-name-ardthyrnkole + group: Medicine + desc: reagent-desc-ardthyrnkole + physicalDesc: reagent-physical-desc-blazing + flavor: sour + color: "#894379" + worksOnTheDead: true + metabolisms: + Medicine: + effects: + - !type:HealthChange + conditions: + - !type:Temperature + min: 343.3 + damage: + types: + Cold: -5 + Heat: -3 # offsets heat damage from the pod + Shock: -3 + +- type: reagent + id: Natusixadone + name: reagent-name-natusixadone + group: Medicine + desc: reagent-desc-natusixadone + physicalDesc: reagent-physical-desc-bubbling + flavor: medicine + color: "#acbb27" + worksOnTheDead: true + metabolisms: + Medicine: + effects: + - !type:HealthChange + conditions: + - !type:Temperature + min: 343.3 + damage: + types: + Cellular: -4 + Heat: -3 diff --git a/Resources/Prototypes/_Funkystation/Reagents/toxins.yml b/Resources/Prototypes/_Funkystation/Reagents/toxins.yml new file mode 100644 index 0000000000..9e275241a0 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Reagents/toxins.yml @@ -0,0 +1,68 @@ +- type: reagent + id: Heparin + name: reagent-name-heparin + group: Toxins + desc: reagent-desc-heparin + physicalDesc: reagent-physical-desc-shiny + flavor: sharp + color: "#f9cab3" + reactiveEffects: + metabolisms: + Poison: + metabolismRate: 2.0 + effects: + - !type:HealthChange + damage: + types: + Bloodloss: 4 + - !type:ModifyBleedAmount + amount: 6 + +- type: reagent + id: Rhigoxane # Reference to the old name for Hercuri on SS13, but directly a toxin. + name: reagent-name-rhigoxane + group: Toxins + desc: reagent-desc-rhigoxane + physicalDesc: reagent-physical-desc-refreshing + flavor: antifreeze # warm + color: "#34b3c9" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Cold: 1 # Chip Damage really, the chem already deals heavy damage from the cold effect + - !type:AdjustTemperature + amount: -25000 # About? a temp level down every 2 seconds pretty sure + +- type: reagent + id: Spewium # ipecac+ + name: reagent-name-spewium + group: Toxins + desc: reagent-desc-spewium + physicalDesc: reagent-physical-desc-overpowering + flavor: horrible + color: "#2e4404" + metabolisms: + Poison: + effects: + - !type:ChemVomit + probability: 0.5 + +- type: reagent + id: Pestiline # Horseman of the Apocalypse >:3 + name: reagent-name-pestiline + group: Toxins + desc: reagent-desc-pestiline + flavor: punishment + color: "#cf3600" + physicalDesc: reagent-physical-desc-sickly + metabolisms: + Poison: + metabolismRate: 0.02 # 20 damage after 50 seconds + effects: + - !type:HealthChange + damage: + types: + Cellular: 0.4 diff --git a/Resources/Prototypes/_Funkystation/Recipes/Reactions/exotic.yml b/Resources/Prototypes/_Funkystation/Recipes/Reactions/exotic.yml new file mode 100644 index 0000000000..b0992e6ad9 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Recipes/Reactions/exotic.yml @@ -0,0 +1,136 @@ +- type: reaction + id: ExoticReagent + reactants: + Razorium: + amount: 1 + Licoxide: + amount: 1 + Pestiline: + amount: 1 + UnstableMutagen: + amount: 1 + products: + ExoticReagent: 1 + +- type: reaction + id: Stasicillin + reactants: + ExoticReagent: + amount: 1 + ChloralHydrate: + amount: 1 + Cryoxadone: + amount: 1 + Saline: + amount: 1 + products: + Stasicillin: 1 + +- type: reaction + id: Negacordrazine + reactants: + ExoticReagent: + amount: 1 + Tricordrazine: + amount: 1 + Granibitulari: + amount: 1 + products: + Negacordrazine: 1 + +- type: reaction + id: StabilisedStimulants + reactants: + ExoticReagent: + amount: 1 + Desoxyephedrine: + amount: 1 + Nicotine: + amount: 1 + Coffee: + amount: 1 + products: + StabilisedStimulants: 1 + +- type: reaction + id: Revivopine + reactants: + ExoticReagent: + amount: 1 + Salbutamol: + amount: 1 + Convermol: + amount: 1 + Epinephrine: + amount: 1 + products: + Revivopine: 1 + +- type: reaction + id: ExoticBarozine + reactants: + ExoticReagent: + amount: 1 + Revivopine: + amount: 1 + Leporazine: + amount: 1 + SalicylicAcid: + amount: 1 + products: + Barozine: 1 + +- type: reaction + id: VestineOmnizine + reactants: + Negacordrazine: + amount: 1 + Vestine: + amount: 1 + products: + Omnizine: 1 + +- type: reaction + id: Ichor # Hardest chem Funkychem has, even surpassing that one REALLY dumb narcolepsy chem as it's 8 steps away from base elements compared to 7, and requires THREE departments + reactants: + ExoticReagent: + amount: 1 + Omnizine: + amount: 1 + StabilisedStimulants: + amount: 1 + Stasicillin: + amount: 1 + Cognizine: + amount: 1 + products: + Ichor: 1 + +- type: reaction + id: Corgium + reactants: + ExoticReagent: + amount: 1 + Oxygen: + amount: 1 + Carbon: + amount: 1 + Blood: + amount: 1 + products: + Corgium: 1 + +- type: reaction + id: CreateCorgiPuppy + impact: Low + quantized: true + reactants: + Corgium: + amount: 25 + Water: + amount: 5 + effects: + - !type:CreateEntityReactionEffect + entity: MobCorgiPuppy + +# Exotic could make mats / explode, but the former's better a diff chem and a diff PR, and latter's better for a pyrotechnics rework. Expansion's mostly meds and toxins. diff --git a/Resources/Prototypes/_Funkystation/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_Funkystation/Recipes/Reactions/medicine.yml new file mode 100644 index 0000000000..f4fc31e94c --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Recipes/Reactions/medicine.yml @@ -0,0 +1,161 @@ +# burn +- type: reaction + id: Oxandrolone + reactants: + Phenol: + amount: 1 + Carbon: + amount: 2 + Dermaline: # DeltaV - we still have wizden basics + amount: 1 + products: + Oxandrolone: 4 + +# brute +- type: reaction + id: SalicylicAcid + reactants: + Phenol: + amount: 1 + Bicaridine: # DeltaV - we still have wizden basics + amount: 1 + SulfuricAcid: + amount: 1 + Carbon: + amount: 1 + products: + SalicylicAcid: 4 + +# airloss +- type: reaction + id: Granibitulari + reactants: + TableSalt: + amount: 1 + Carbon: + amount: 1 + Potassium: + amount: 1 + products: + Granibitulari: 3 + +- type: reaction + id: Salbutamol + reactants: + Dexalin: + amount: 1 + Inaprovaline: + amount: 1 + Phenol: + amount: 1 + Lithium: + amount: 1 + products: + Salbutamol: 4 + +- type: reaction + id: Convermol + reactants: + Dexalin: + amount: 1 + Aluminium: + amount: 1 + Fluorine: + amount: 1 + products: + Convermol: 3 + +# misc +- type: reaction + id: Pielovene + reactants: + Silicon: + amount: 1 + Nitrogen: + amount: 1 + LiquidPie: + amount: 1 + products: + Pielovene: 3 + +- type: reaction + id: Hypothium + reactants: + Nitrogen: # TODO: Switch to Healium + amount: 1 + Omnizine: + amount: 1 + Ethyloxyephedrine: + amount: 1 + products: + Hypothium: 3 + +# pyro +- type: reaction + id: Pyroxadone + minTemp: 433 + reactants: + Dexalin: + amount: 1 + Thermite: + amount: 1 + WeldingFuel: + amount: 1 + products: + Pyroxadone: 3 + +- type: reaction + id: Ardthyrnkole + reactants: + Pyroxadone: + amount: 1 + Plasma: + amount: 1 + catalyst: true + Siderlac: + amount: 1 + products: + Ardthyrnkole: 2 + +- type: reaction + id: Natusixadone + reactants: + Pyroxadone: + amount: 1 + UnstableMutagen: + amount: 1 + products: + Natusixadone: 2 + +- type: reaction + id: SalyLacerinol + impact: Medium + reactants: + Lacerinol: + amount: 1 + SalicylicAcid: + amount: 1 + products: + Razorium: 1 + +- type: reaction + id: SalyPuncturase + impact: Medium + reactants: + Puncturase: + amount: 1 + SalicylicAcid: + amount: 1 + products: + Razorium: 1 + +- type: reaction + id: SalyBruizine + impact: Medium + reactants: + Bruizine: + amount: 1 + SalicylicAcid: + amount: 1 + products: + Razorium: 1 diff --git a/Resources/Prototypes/_Funkystation/Recipes/Reactions/toxins.yml b/Resources/Prototypes/_Funkystation/Recipes/Reactions/toxins.yml new file mode 100644 index 0000000000..1aed9000e8 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Recipes/Reactions/toxins.yml @@ -0,0 +1,115 @@ +- type: reaction + id: Heparin + reactants: + TableSalt: + amount: 1 + Aluminium: + amount: 1 + Ethanol: + amount: 1 + Lithium: + amount: 1 + products: + Heparin: 4 + +- type: reaction + id: Rhigoxane + reactants: + Plasma: # Can be a pretty lethal chem, but it shouldn't be complex, thus plasma :godo: + amount: 1 + Nitrogen: + amount: 3 # And a chem hog... poor jugs. + Water: + amount: 1 + products: + Rhigoxane: 3 + +- type: reaction + id: Spewium + reactants: + Ipecac: + amount: 1 + Ultravasculine: # DeltaV - we still have wizden basics + amount: 1 + Licoxide: + amount: 1 + products: + Spewium: 3 + +- type: reaction + id: Pestiline + reactants: + Salbutamol: + amount: 1 + Ultravasculine: # DeltaV - we still have wizden basics + amount: 1 + Arithrazine: + amount: 2 + products: + Pestiline: 2 + +- type: reaction + id: LeporazineLone + impact: Medium + reactants: + Leporazine: + amount: 1 + Oxandrolone: + amount: 1 + products: + Licoxide: 1 + +- type: reaction + id: PyrazineLone + impact: Medium + reactants: + Pyrazine: + amount: 1 + Oxandrolone: + amount: 1 + products: + Licoxide: 1 + +- type: reaction + id: InsuzineLone + impact: Medium + reactants: + Insuzine: + amount: 1 + Oxandrolone: + amount: 1 + products: + Licoxide: 1 + +- type: reaction + id: LeporazinePyra + impact: Medium + reactants: + Pyrazine: + amount: 1 + Leporazine: + amount: 1 + products: + Licoxide: 1 + +- type: reaction + id: LeporazineInsu + impact: Medium + reactants: + Leporazine: + amount: 1 + Insuzine: + amount: 1 + products: + Licoxide: 1 + +- type: reaction + id: PyrazineInsu + impact: Medium + reactants: + Pyrazine: + amount: 1 + Insuzine: + amount: 1 + products: + Licoxide: 1 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat.yml index bda82a7ca9..cfebaff256 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat.yml @@ -18,7 +18,7 @@ solutions: food: reagents: - - ReagentId: Bicaridine + - ReagentId: SalicylicAcid # Funkychem - no more bicaridine Quantity: 20 - type: StaticPrice price: 750 diff --git a/Resources/ServerInfo/Funkystation/Guidebook/ChemicalTabs/Exotic.xml b/Resources/ServerInfo/Funkystation/Guidebook/ChemicalTabs/Exotic.xml new file mode 100644 index 0000000000..d463a3b069 --- /dev/null +++ b/Resources/ServerInfo/Funkystation/Guidebook/ChemicalTabs/Exotic.xml @@ -0,0 +1,7 @@ + + +# Exotic +The chemicals in this list are hard to obtain, unique chemicals that the average medbay may not see often. + + + diff --git a/Resources/ServerInfo/Guidebook/Chemicals.xml b/Resources/ServerInfo/Guidebook/Chemicals.xml index b68431a1a7..92526de9d0 100644 --- a/Resources/ServerInfo/Guidebook/Chemicals.xml +++ b/Resources/ServerInfo/Guidebook/Chemicals.xml @@ -20,6 +20,9 @@ Knowing different types of chemicals and their effects is important for being ab ## Toxins +## Exotic + + ## Foods diff --git a/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml b/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml index b041a32fde..44b43cee62 100644 --- a/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml +++ b/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml @@ -15,6 +15,7 @@ Botany and Chemistry can often work together to produce better medicine (or recr + diff --git a/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml b/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml index 95c898b8e0..5a67513cbe 100644 --- a/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml +++ b/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml @@ -24,8 +24,8 @@ An important note: Most medication has an overdose level, which will cause harm - Burn Damage: Dermaline or Ointment - Toxin (Poison): Dylovene - Toxin (Radiation) Hyronalin or Arithrazine -- Airloss: Dexaline or Inaprovaline -- Bloodloss: Dexaline (Examine the patient, if pale, they still need blood or iron.) +- Airloss: Dexalin, Salbutamol, Inaprovaline, or Convermol +- Bloodloss: Dexalin or Salbutamol (Examine the patient, if pale, they still need blood or iron.) - Bleeding: Tranexamic acid and Gauze (Bleeding can also be cauterized with burn damage.) Many stations are stocked with kits in storage, and all medics have some equipment in their starting belt. diff --git a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml index 7a09a1647d..ef1d387cdd 100644 --- a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml +++ b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml @@ -10,7 +10,7 @@ These medications are almost always useful to medbay in one way or another. - + # Specialty Medications diff --git a/Resources/ServerInfo/Guidebook/_DV/Medical/FrequentlyUsedChemicals.xml b/Resources/ServerInfo/Guidebook/_DV/Medical/FrequentlyUsedChemicals.xml new file mode 100644 index 0000000000..7a224aab2c --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_DV/Medical/FrequentlyUsedChemicals.xml @@ -0,0 +1,39 @@ + +# Frequently Used Chemicals + +## Basic Medicines + +These medicines are the absolute basic you will see stocked in any medical ward that wants to function. + + + + + + + +## Better Medicines + +These medicines are generally effective, but have specific conditions required for them to work, or noticeable side effects. + + + + + + +## Advanced Brute Medicines + +These medicines are very potent, but only effective on a single type of brute damage. Mixing them will damage the patient. + + + + + +## Advanced Burn Medicines + +These medicines are very potent, but only effective on a single type of burn. Mixing them will damage the patient. + + + + + +