cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 04:17:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Chemistry Update Tweaks/Fixes (very overdue, sorry) (#10102)

Browse Source
This commit is contained in:
sadkermit
2020-10-01 05:45:23 +01:00
committed by GitHub
parent fa348a2a7a
commit d8e7edc931
9 changed files with 87 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/rig/modules/utility.dm
+2 -6
View File
@@ -176,7 +176,6 @@
list("antibiotics", "thetamycin", /datum/reagent/thetamycin, 80),
list("antitoxins", "dylovene", /datum/reagent/dylovene, 80),
list("nutrients", "glucose", /datum/reagent/nutriment/glucose, 80),
list("saline", "saline", /datum/reagent/saline, 80),
list("hyronalin", "hyronalin", /datum/reagent/hyronalin, 80),
list("synaptizine", "synaptizine", /datum/reagent/synaptizine, 80),
list("radium", "radium", /datum/reagent/radium, 80)
@@ -197,7 +196,6 @@
list("antibiotics", "thetamycin", /datum/reagent/thetamycin, 20),
list("antitoxins", "dylovene", /datum/reagent/dylovene, 20),
list("nutrients", "glucose", /datum/reagent/nutriment/glucose, 80),
list("saline", "saline", /datum/reagent/saline, 80),
list("hyronalin", "hyronalin", /datum/reagent/hyronalin, 20),
list("synaptizine", "synaptizine", /datum/reagent/synaptizine, 20),
list("radium", "radium", /datum/reagent/radium, 20)
@@ -293,8 +291,7 @@
list("synaptizine", "synaptizine", /datum/reagent/synaptizine, 30),
list("hyperzine", "hyperzine", /datum/reagent/hyperzine, 30),
list("oxycomorphine", "oxycomorphine", /datum/reagent/oxycomorphine, 30),
list("nutrients", "glucose", /datum/reagent/nutriment/glucose, 80),
list("saline", "saline", /datum/reagent/saline, 80)
list("nutrients", "glucose", /datum/reagent/nutriment/glucose, 80)
)
interface_name = "combat chem dispenser"
@@ -311,8 +308,7 @@
list("hyperzine", "hyperzine", /datum/reagent/hyperzine, 30),
list("oxycomorphine", "oxycomorphine", /datum/reagent/oxycomorphine, 30),
list("phoron", "phoron", /datum/reagent/toxin/phoron, 60),
list("kois", "k'ois paste", /datum/reagent/kois, 80),
list("saline", "saline", /datum/reagent/saline, 80)
list("kois", "k'ois paste", /datum/reagent/kois, 80)
)
interface_name = "vaurca combat chem dispenser"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
+3 -3
View File
@@ -93,7 +93,7 @@
/datum/reagent/copper/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if (alien & IS_SKRELL)
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
M.add_chemical_effect(CE_BLOODRESTORE, 3 * removed)
/datum/reagent/alcohol //Parent class for all alcoholic reagents, though this one shouldn't be used anywhere.
name = null // This null name should prevent alcohol from being added to global lists.
@@ -293,7 +293,7 @@
/datum/reagent/iron/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if (!(alien & (IS_SKRELL | IS_VAURCA)))
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
M.add_chemical_effect(CE_BLOODRESTORE, 3 * removed)
/datum/reagent/lithium
name = "Lithium"
@@ -553,7 +553,7 @@
/datum/reagent/sulfur/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if (alien & IS_VAURCA)
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
M.add_chemical_effect(CE_BLOODRESTORE, 3 * removed)
/datum/reagent/tungsten
name = "Tungsten"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+6 -5
View File
@@ -1535,11 +1535,12 @@
/datum/reagent/saline
name = "Saline Plus"
description = "Saline Plus, or Vaughan's Saline Solution, is an expensive improvement upon the various saline solutions of old. Saline Plus has wide clinical applications in the treatment of dehydration and hypovolaemia, with no more debates as to whether it is effective or not."
description = "Saline Plus is an expensive improvement upon the various saline solutions of old. Saline Plus has wide clinical applications in the treatment of dehydration and hypovolaemia, with no more debates as to whether it is effective or not."
reagent_state = LIQUID
scannable = TRUE
metabolism = REM * 4
metabolism = 1.5
overdose = 5 // Low overdose and fast metabolism to necessitate IV drip usage
od_minimum_dose = 10
color = "#0064C877"
taste_description = "premium salty water"
unaffected_species = IS_MACHINE
@@ -1551,13 +1552,13 @@
M.adjustHydrationLoss(-removed*2)
else
M.adjustHydrationLoss(-removed*5)
if(volume < 2)
if(volume < 3)
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
/datum/reagent/saline/overdose(var/mob/living/carbon/M, var/alien)
M.confused = max(M.confused, 20)
M.make_jittery(5)
if(prob(dose / 2))
if(prob(2))
M.emote("twitch")
/datum/reagent/adrenaline
@@ -1627,7 +1628,7 @@
reagent_state = LIQUID
scannable = TRUE
color = "#AA8866"
overdose = 40
overdose = 30
metabolism = 0.1 * REM
taste_description = "sourness"
fallback_specific_heat = 1
code/modules/reagents/Chemistry-Recipes.dm
+2 -2
View File
@@ -629,7 +629,7 @@
name = "Saline Plus"
id = "saline"
result = /datum/reagent/saline
required_reagents = list(/datum/reagent/sugar = 0.4, /datum/reagent/water = 1, /datum/reagent/sodiumchloride = 0.9)
required_reagents = list(/datum/reagent/water = 2, /datum/reagent/sugar = 0.2, /datum/reagent/sodiumchloride = 0.4)
catalysts = list(/datum/reagent/toxin/phoron = 5)
result_amount = 1
@@ -3595,7 +3595,7 @@
name = "RMT"
id = "rmt"
result = /datum/reagent/rmt
result_amount = 1
result_amount = 2
required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/inaprovaline = 1)
/datum/chemical_reaction/gunpowder
code/modules/reagents/reagent_containers/glass/bottle.dm
+7 -1
View File
@@ -210,4 +210,10 @@
name = "mortaphenyl bottle"
desc = "A small bottle. Contains mortaphenyl - treats mild-severe pain as a result of severe, physical injury."
icon_state = "bottle-3"
reagents_to_add = list(/datum/reagent/mortaphenyl = 60)
reagents_to_add = list(/datum/reagent/mortaphenyl = 60)
/obj/item/reagent_containers/glass/bottle/perconol
name = "perconol bottle"
desc = "A small bottle. Contains perconol - treats minor-moderate pain as a result of physical injury."
icon_state = "bottle-3"
reagents_to_add = list(/datum/reagent/perconol = 60)
code/modules/reagents/reagent_containers/pill.dm
+18 -18
View File
@@ -87,7 +87,7 @@
//Pills
/obj/item/reagent_containers/pill/antitox
name = "Anti-toxins Pill"
name = "10u Dylovene Pill"
desc = "Neutralizes many common toxins."
icon_state = "pill17"
reagents_to_add = list(/datum/reagent/dylovene = 10)
@@ -111,79 +111,79 @@
reagents_to_add = list(/datum/reagent/adminordrazine = 50)
/obj/item/reagent_containers/pill/stox
name = "Sleeping Pill"
name = "15u Soporific Pill"
desc = "Commonly used to treat insomnia."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/soporific = 15)
/obj/item/reagent_containers/pill/kelotane
name = "Kelotane Pill"
name = "10u Kelotane Pill"
desc = "Used to treat minor burns."
icon_state = "pill11"
reagents_to_add = list(/datum/reagent/kelotane = 10)
/obj/item/reagent_containers/pill/perconol
name = "Perconol Pill"
name = "10u Perconol Pill"
desc = "A light painkiller available over-the-counter."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/perconol = 10)
/obj/item/reagent_containers/pill/mortaphenyl
name = "Mortaphenyl Pill"
name = "10u Mortaphenyl Pill"
desc = "A mortaphenyl pill, it's a potent painkiller."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/mortaphenyl = 10)
/obj/item/reagent_containers/pill/corophenidate
name = "Corophenidate Pill"
name = "5u Corophenidate Pill"
desc = "Improves the ability to concentrate."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/mental/corophenidate = 5)
/obj/item/reagent_containers/pill/minaphobin
name = "Minaphobin Pill"
name = "5u Minaphobin Pill"
desc = "Used to treat anxiety disorders and depression."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/mental/minaphobin = 5)
/obj/item/reagent_containers/pill/inaprovaline
name = "Inaprovaline Pill"
name = "10u Inaprovaline Pill"
desc = "Used to stabilize heart activity."
icon_state = "pill20"
reagents_to_add = list(/datum/reagent/inaprovaline = 10)
/obj/item/reagent_containers/pill/dexalin
name = "Dexalin Pill"
name = "15u Dexalin Pill"
desc = "Used to treat oxygen deprivation."
icon_state = "pill16"
reagents_to_add = list(/datum/reagent/dexalin = 15)
/obj/item/reagent_containers/pill/dexalin_plus
name = "Dexalin Plus Pill"
name = "15u Dexalin Plus Pill"
desc = "Used to treat extreme oxygen deprivation."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/dexalin/plus = 15)
/obj/item/reagent_containers/pill/dermaline
name = "Dermaline Pill"
name = "10u Dermaline Pill"
desc = "Used to treat severe burn wounds."
icon_state = "pill12"
reagents_to_add = list(/datum/reagent/dermaline = 10)
/obj/item/reagent_containers/pill/dylovene
name = "Dylovene Pill"
name = "15u Dylovene Pill"
desc = "A broad-spectrum anti-toxin."
icon_state = "pill13"
reagents_to_add = list(/datum/reagent/dylovene = 15)
/obj/item/reagent_containers/pill/butazoline
name = "Butazoline Pill"
name = "10u Butazoline Pill"
desc = "Used to treat major injuries and bleeding."
icon_state = "pill18"
reagents_to_add = list(/datum/reagent/butazoline = 10)
/obj/item/reagent_containers/pill/bicaridine
name = "Bicaridine Pill"
name = "10u Bicaridine Pill"
desc = "Used to treat minor injuries and bleeding."
icon_state = "pill18"
reagents_to_add = list(/datum/reagent/bicaridine = 10)
@@ -207,7 +207,7 @@ obj/item/reagent_containers/pill/tranquility
reagents_to_add = list(/datum/reagent/mental/neurapan = 15, /datum/reagent/impedrezene = 10)
/obj/item/reagent_containers/pill/thetamycin
name = "Thetamycin Pill"
name = "15u Thetamycin Pill"
desc = "Used to treat infections and septicaemia."
icon_state = "pill19"
reagents_to_add = list(/datum/reagent/thetamycin = 15)
@@ -223,13 +223,13 @@ obj/item/reagent_containers/pill/tranquility
. = ..()
/obj/item/reagent_containers/pill/rmt
name = "Regenerative-Muscular Tissue Supplement Pill"
name = "15u Regenerative-Muscular Tissue Supplement Pill"
desc = "Commonly abbreviated to RMT, it contains chemicals rampantly used by those seeking to remedy the effects of prolonged zero-gravity adaptations."
icon_state = "pill19"
reagents_to_add = list(/datum/reagent/rmt = 30)
reagents_to_add = list(/datum/reagent/rmt = 15)
/obj/item/reagent_containers/pill/cetahydramine
name = "Cetahydramine Pill"
name = "5u Cetahydramine Pill"
desc = "Used to treat coughing, sneezing and itching."
icon_state = "pill19"
reagents_to_add = list(/datum/reagent/cetahydramine = 5)