diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index c51fdb02a9..e7d932ff03 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -92,8 +92,8 @@ /obj/item/reagent_container/hypospray/autoinjector/adrenaline name = "epinephrine autoinjector" - chemname = "adrenaline (concentrated)" - desc = "An autoinjector loaded with 3 uses of Epinephrine, better known as Adrenaline, a nerve stimulant useful in restarting the heart. In this concentrated form, it can be used to pull people out of comas or unconscious states due to severe trauma." + chemname = "adrenaline_concentrated" + desc = "An autoinjector loaded with 3 uses of Epinephrine, better known as Adrenaline, a nerve stimulant useful in restarting the heart. In this concentrated form, it will prevent unconciousness but will cause minor suffocation." amount_per_transfer_from_this = LOWM_REAGENTS_OVERDOSE * INJECTOR_PERCENTAGE_OF_OD volume = (LOWM_REAGENTS_OVERDOSE * INJECTOR_PERCENTAGE_OF_OD) * INJECTOR_USES display_maptext = TRUE diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 885d3067ce..e3d1774508 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -879,12 +879,12 @@ /obj/item/storage/pouch/pressurized_reagent_canister/revival/Initialize() . = ..() //we don't call fill_with because of the complex mix of chemicals we have - inner.reagents.add_reagent("adrenaline (concentrated)", inner.volume/3) + inner.reagents.add_reagent("adrenaline_concentrated", inner.volume/3) inner.reagents.add_reagent("inaprovaline", inner.volume/3) inner.reagents.add_reagent("tricordrazine", inner.volume/3) if(contents.len > 0) var/obj/item/reagent_container/hypospray/autoinjector/empty/medic/A = contents[1] - A.reagents.add_reagent("adrenaline (concentrated)", A.volume/3) + A.reagents.add_reagent("adrenaline_concentrated", A.volume/3) A.reagents.add_reagent("inaprovaline", A.volume/3) A.reagents.add_reagent("tricordrazine", A.volume/3) A.update_uses_left() diff --git a/code/modules/reagents/chemistry_reactions/medical.dm b/code/modules/reagents/chemistry_reactions/medical.dm index f25d9281e8..6ab106837f 100644 --- a/code/modules/reagents/chemistry_reactions/medical.dm +++ b/code/modules/reagents/chemistry_reactions/medical.dm @@ -14,10 +14,10 @@ required_reagents = list("carbon" = 1, "nitrogen" = 1, "oxygen" = 1) result_amount = 2 -/datum/chemical_reaction/adrenaline +/datum/chemical_reaction/adrenaline/strong name = "Epinephrine (concentrated)" - id = "adrenaline (concentrated)" - result = "adrenaline (concentrated)" + id = "adrenaline_concentrated" + result = "adrenaline_concentrated" required_reagents = list("carbon" = 1, "nitrogen" = 1, "oxygen" = 1) required_catalysts = list("phoron" = 5) result_amount = 1 diff --git a/code/modules/reagents/chemistry_reagents/medical.dm b/code/modules/reagents/chemistry_reagents/medical.dm index aa879fe44e..ad1347daeb 100644 --- a/code/modules/reagents/chemistry_reagents/medical.dm +++ b/code/modules/reagents/chemistry_reagents/medical.dm @@ -285,7 +285,7 @@ /datum/reagent/medical/adrenaline/strong name = "Epinephrine (concentrated)" - id = "adrenaline (concentrated)" + id = "adrenaline_concentrated" description = "A natural muscle and heart stimulant that is in a high concerntration. Useful for restarting the heart and preventing unconciousness but in this concentrated form it will cause minor suffocation. Overdosing may stress the heart and cause tissue damage." reagent_state = LIQUID color = "#FFE702" // Yellow-ish @@ -293,7 +293,7 @@ overdose_critical = LOWM_REAGENTS_OVERDOSE_CRITICAL custom_metabolism = AMOUNT_PER_TIME(1, 10 SECONDS) chemclass = CHEM_CLASS_COMMON - properties = list(PROPERTY_PAINKILLING = 2, PROPERTY_ELECTROGENETIC = 4, PROPERTY_REVITALIZING = 1, PROPERTY_HYPOXEMIC = 5, PROPERTY_INTRAVENOUS = 1) + properties = list(PROPERTY_PAINKILLING = 1.5, PROPERTY_ELECTROGENETIC = 4, PROPERTY_REVITALIZING = 1, PROPERTY_HYPOXEMIC = 5, PROPERTY_INTRAVENOUS = 1) flags = REAGENT_TYPE_MEDICAL | REAGENT_SCANNABLE /datum/reagent/medical/ultrazine diff --git a/icons/obj/items/syringe.dmi b/icons/obj/items/syringe.dmi index d08b2a8c2d..d54123a898 100644 Binary files a/icons/obj/items/syringe.dmi and b/icons/obj/items/syringe.dmi differ