From 5bfeb5492e5fde8f608ee1bcf31ecd8e2a714b11 Mon Sep 17 00:00:00 2001 From: bearrrrrrrrr Date: Fri, 1 Mar 2024 03:20:49 -0500 Subject: [PATCH 1/5] adrenaline changes --- code/game/objects/items/reagent_containers/autoinjectors.dm | 2 +- code/modules/reagents/chemistry_reagents/medical.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index f7de239e4a..4a06e0f418 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -102,7 +102,7 @@ /obj/item/reagent_container/hypospray/autoinjector/adrenaline_concentrated name = "concentrated adrenaline autoinjector" chemname = "adrenaline_concentrated" - desc = "An autoinjector loaded with 3 uses of Concentrated Adrenaline, a stimulant that prevents unconsciousness but causes suffocation in the process." + desc = "An autoinjector loaded with 3 uses of Concentrated Adrenaline, a stimulant that prevents unconsciousness but causes serious cardiovascular strain. A warning clearly states to inject a single person no more than once!" 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/modules/reagents/chemistry_reagents/medical.dm b/code/modules/reagents/chemistry_reagents/medical.dm index 35ae94a27f..fb211ac4ac 100644 --- a/code/modules/reagents/chemistry_reagents/medical.dm +++ b/code/modules/reagents/chemistry_reagents/medical.dm @@ -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 = 1.5, 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 = 2.5, PROPERTY_INTRAVENOUS = 1, PROPERTY_CARDIOTOXIC = 2.5) flags = REAGENT_TYPE_MEDICAL | REAGENT_SCANNABLE /datum/reagent/medical/ultrazine From b1dbb0861ff33b789ebc623fb9f6b3a340731e71 Mon Sep 17 00:00:00 2001 From: bearrrrrrrr <54826962+bearrrrrrrr@users.noreply.github.com> Date: Fri, 1 Mar 2024 03:41:32 -0500 Subject: [PATCH 2/5] Update autoinjectors.dm --- code/game/objects/items/reagent_containers/autoinjectors.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index 4a06e0f418..d7e4258b5b 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -102,7 +102,7 @@ /obj/item/reagent_container/hypospray/autoinjector/adrenaline_concentrated name = "concentrated adrenaline autoinjector" chemname = "adrenaline_concentrated" - desc = "An autoinjector loaded with 3 uses of Concentrated Adrenaline, a stimulant that prevents unconsciousness but causes serious cardiovascular strain. A warning clearly states to inject a single person no more than once!" + desc = "An autoinjector loaded with 3 uses of Concentrated Adrenaline, a stimulant that prevents unconsciousness but causes serious cardiovascular strain. WARNING: Do not administer more than two injections per individual!" 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 From f5aa8b65c753c9bc4ea309db74b9b526c12565bc Mon Sep 17 00:00:00 2001 From: bearrrrrrrr <54826962+bearrrrrrrr@users.noreply.github.com> Date: Sat, 2 Mar 2024 04:37:06 -0500 Subject: [PATCH 3/5] Update autoinjectors.dm --- code/game/objects/items/reagent_containers/autoinjectors.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index d7e4258b5b..75045f7da9 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -102,7 +102,7 @@ /obj/item/reagent_container/hypospray/autoinjector/adrenaline_concentrated name = "concentrated adrenaline autoinjector" chemname = "adrenaline_concentrated" - desc = "An autoinjector loaded with 3 uses of Concentrated Adrenaline, a stimulant that prevents unconsciousness but causes serious cardiovascular strain. WARNING: Do not administer more than two injections per individual!" + desc = "An autoinjector loaded with 3 uses of Concentrated Adrenaline, a stimulant that prevents unconsciousness but causes serious cardiovascular strain. WARNING: Do not inject an individual more than once!" 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 From 75589f9b60892634c5e9f48e105e668773441d8b Mon Sep 17 00:00:00 2001 From: bearrrrrrrr <54826962+bearrrrrrrr@users.noreply.github.com> Date: Sat, 2 Mar 2024 04:39:21 -0500 Subject: [PATCH 4/5] Update medical.dm --- code/modules/reagents/chemistry_reagents/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry_reagents/medical.dm b/code/modules/reagents/chemistry_reagents/medical.dm index fb211ac4ac..cea3400086 100644 --- a/code/modules/reagents/chemistry_reagents/medical.dm +++ b/code/modules/reagents/chemistry_reagents/medical.dm @@ -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 = 1.5, PROPERTY_ELECTROGENETIC = 4, PROPERTY_REVITALIZING = 1, PROPERTY_HYPOXEMIC = 2.5, PROPERTY_INTRAVENOUS = 1, PROPERTY_CARDIOTOXIC = 2.5) + properties = list(PROPERTY_PAINKILLING = 1.5, PROPERTY_ELECTROGENETIC = 4, PROPERTY_REVITALIZING = 1, PROPERTY_HYPOXEMIC = 2.5, PROPERTY_INTRAVENOUS = 1, PROPERTY_CARDIOTOXIC = 1.5) flags = REAGENT_TYPE_MEDICAL | REAGENT_SCANNABLE /datum/reagent/medical/ultrazine From e3a2da115a6fb7ad22bac41711c58f00a8a6e8fe Mon Sep 17 00:00:00 2001 From: bearrrrrrrr <54826962+bearrrrrrrr@users.noreply.github.com> Date: Sat, 2 Mar 2024 06:12:59 -0500 Subject: [PATCH 5/5] Update autoinjectors.dm --- code/game/objects/items/reagent_containers/autoinjectors.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index 75045f7da9..0666ee6abc 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -102,7 +102,7 @@ /obj/item/reagent_container/hypospray/autoinjector/adrenaline_concentrated name = "concentrated adrenaline autoinjector" chemname = "adrenaline_concentrated" - desc = "An autoinjector loaded with 3 uses of Concentrated Adrenaline, a stimulant that prevents unconsciousness but causes serious cardiovascular strain. WARNING: Do not inject an individual more than once!" + desc = "An autoinjector loaded with 3 uses of Concentrated Adrenaline, a stimulant that prevents unconsciousness but causes serious cardiovascular strain. WARNING: Do not inject an individual more than twice!" 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