Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

epinephrine renamed to adrenaline, changes the desc of it #46

Merged
merged 4 commits into from
Nov 5, 2023
Merged

epinephrine renamed to adrenaline, changes the desc of it #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4491ab8
Epinephrine renamed to Concentrated Adrenaline
private-tristan Nov 4, 2023
77ced46
Merge branch 'master' into adrenaline
private-tristan Nov 4, 2023
d35fb6a
Update autoinjectors.dm
private-tristan Nov 4, 2023
c3a2a1a
Update code/game/objects/items/reagent_containers/autoinjectors.dm
private-tristan Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/game/objects/items/reagent_containers/autoinjectors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@
maptext_label = "Ep"

/obj/item/reagent_container/hypospray/autoinjector/adrenaline_concentrated
name = "epinephrine (concentrated) autoinjector"
name = "concentrated adrenaline 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 will prevent unconciousness but will cause minor suffocation."
desc = "An autoinjector loaded with 3 uses of Concentrated Adrenaline, a stimulant that prevents unconsciousness but causes suffocation in the process."
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
maptext_label = "Ep"
maptext_label = "Ad"

/obj/item/reagent_container/hypospray/autoinjector/dexalinp
name = "dexalin plus autoinjector"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry_reactions/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
result_amount = 2

/datum/chemical_reaction/adrenaline_concentrated
name = "Epinephrine (concentrated)"
name = "Concentrated Adrenaline"
id = "adrenaline_concentrated"
result = "adrenaline_concentrated"
required_reagents = list("carbon" = 1, "nitrogen" = 1, "oxygen" = 1, "phoron" = 3)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry_reagents/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
flags = REAGENT_TYPE_MEDICAL | REAGENT_SCANNABLE

/datum/reagent/medical/adrenaline_concentrated
name = "Epinephrine (concentrated)"
name = "Concentrated Adrenaline"
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
Expand Down
Loading