From f19001feb8a528a41ca4ab4f4b8f355897832397 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 23 Aug 2014 16:33:29 +0200 Subject: [PATCH] Renames anti-toxin bottles to dylovene. Soporific tossed out. Sleep toxin renamed to Soporific. Based on http://baystation12.net/forums/viewtopic.php?p=237269#p237269 --- code/game/machinery/adv_med.dm | 2 +- .../mecha/equipment/tools/medical_tools.dm | 2 +- code/modules/paperwork/paper.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 38 +------------------ code/modules/reagents/Chemistry-Recipes.dm | 6 +-- .../reagent_containers/glass/bottle.dm | 8 ++-- 6 files changed, 12 insertions(+), 46 deletions(-) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 9c9cd2b5ab..0995780dc9 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -277,7 +277,7 @@ dat += text("[]\tBlood Level %: [] ([] units)
", (blood_volume > 448 ?"" : ""), blood_percent, blood_volume) if(occupant.reagents) dat += text("Inaprovaline units: [] units
", occupant.reagents.get_reagent_amount("inaprovaline")) - dat += text("Soporific (Sleep Toxin): [] units
", occupant.reagents.get_reagent_amount("stoxin")) + dat += text("Soporific: [] units
", occupant.reagents.get_reagent_amount("stoxin")) dat += text("[]\tDermaline: [] units
", (occupant.reagents.get_reagent_amount("dermaline") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("dermaline")) dat += text("[]\tBicaridine: [] units
", (occupant.reagents.get_reagent_amount("bicaridine") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("bicaridine")) dat += text("[]\tDexalin: [] units
", (occupant.reagents.get_reagent_amount("dexalin") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("dexalin")) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 6b3700164a..015c8f8a24 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -408,7 +408,7 @@ ..() flags |= NOREACT syringes = new - known_reagents = list("inaprovaline"="Inaprovaline","anti_toxin"="Anti-Toxin (Dylovene)") + known_reagents = list("inaprovaline"="Inaprovaline","anti_toxin"="Dylovene") processed_reagents = new create_reagents(max_volume) synth = new (list(src),0) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 515d6b0bc8..a347fca1be 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -450,7 +450,7 @@ /obj/item/weapon/paper/Toxin name = "Chemical Information" - info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Phoron:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter phoron after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Phoron.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep phoron.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administeredd to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tSleep Toxin T#054:
\n\t\t5 units wilkl induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization" + info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Phoron:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter phoron after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Phoron.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep phoron.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administeredd to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tSoporific T#054:
\n\t\t5 units wilkl induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization" /obj/item/weapon/paper/courtroom name = "A Crash Course in Legal SOP on SS13" diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 0d8986fcfd..2088fa555b 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -368,40 +368,6 @@ datum ..() return - srejuvenate - name = "Soporific Rejuvenant" - id = "stoxin2" - description = "Put people to sleep, and heals them." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - overdose = REAGENTS_OVERDOSE - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(!data) data = 1 - data++ - if(M.losebreath >= 10) - M.losebreath = max(10, M.losebreath-10) - holder.remove_reagent(src.id, 0.2) - switch(data) - if(1 to 15) - M.eye_blurry = max(M.eye_blurry, 10) - if(15 to 25) - M.drowsyness = max(M.drowsyness, 20) - if(25 to INFINITY) - M.sleeping += 1 - M.adjustOxyLoss(-M.getOxyLoss()) - M.SetWeakened(0) - M.SetStunned(0) - M.SetParalysis(0) - M.dizziness = 0 - M.drowsyness = 0 - M.stuttering = 0 - M.confused = 0 - M.jitteriness = 0 - ..() - return - inaprovaline name = "Inaprovaline" id = "inaprovaline" @@ -1147,7 +1113,7 @@ datum return anti_toxin - name = "Anti-Toxin (Dylovene)" + name = "Dylovene" id = "anti_toxin" description = "Dylovene is a broad-spectrum antitoxin." reagent_state = LIQUID @@ -1794,7 +1760,7 @@ datum H.adjustToxLoss(50) toxin/stoxin - name = "Sleep Toxin" + name = "Soporific" id = "stoxin" description = "An effective hypnotic used to treat insomnia." reagent_state = LIQUID diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index c8e317ca86..2b76e810f9 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -64,7 +64,7 @@ datum result_amount = 3 */ stoxin - name = "Sleep Toxin" + name = "Soporific" id = "stoxin" result = "stoxin" required_reagents = list("chloralhydrate" = 1, "sugar" = 4) @@ -85,7 +85,7 @@ datum result_amount = 3 anti_toxin - name = "Anti-Toxin (Dylovene)" + name = "Dylovene" id = "anti_toxin" result = "anti_toxin" required_reagents = list("silicon" = 1, "potassium" = 1, "nitrogen" = 1) @@ -478,7 +478,7 @@ datum result_amount = 4 stoxin - name = "Sleep Toxin" + name = "Soporific" id = "stoxin" result = "stoxin" required_reagents = list("chloralhydrate" = 1, "sugar" = 4) diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index c4beb0a8f9..ae78984385 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -55,8 +55,8 @@ reagents.add_reagent("cyanide", 30) /obj/item/weapon/reagent_containers/glass/bottle/stoxin - name = "sleep-toxin bottle" - desc = "A small bottle of sleep toxins. Just the fumes make you sleepy." + name = "soporific bottle" + desc = "A small bottle of soporific. Just the fumes make you sleepy." icon = 'icons/obj/chemical.dmi' icon_state = "bottle20" @@ -75,8 +75,8 @@ reagents.add_reagent("chloralhydrate", 15) //Intentionally low since it is so strong. Still enough to knock someone out. /obj/item/weapon/reagent_containers/glass/bottle/antitoxin - name = "anti-toxin bottle" - desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug." + name = "dylovene bottle" + desc = "A small bottle of dylovene. Counters poisons, and repairs damage. A wonder drug." icon = 'icons/obj/chemical.dmi' icon_state = "bottle17"