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

EPIc Epi changes #22

Merged
merged 7 commits into from
Oct 25, 2023
Merged

EPIc Epi changes #22

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f268632
Initialcommit
Warfan1815 Oct 22, 2023
79fdef7
missing hash in colour
Warfan1815 Oct 22, 2023
091e190
spelling and description correct
Warfan1815 Oct 23, 2023
306c9ff
colour fix
Warfan1815 Oct 23, 2023
1f1ad03
Merge branch 'master' into Epichanges
Warfan1815 Oct 23, 2023
1ea0620
Merge remote-tracking branch 'origin/Epichanges' into Epichanges
Warfan1815 Oct 23, 2023
62d0dee
changes
morrowwolf Oct 25, 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
1 change: 1 addition & 0 deletions code/__DEFINES/chemistry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@
#define PROPERTY_ANTICARCINOGENIC "anti-carcinogenic"
#define PROPERTY_UNKNOWN "unknown" //just has an OD effect
#define PROPERTY_HEMOSITIC "hemositic"
#define PROPERTY_REVITALIZING "revitalizing"


//Property rarity
Expand Down
4 changes: 2 additions & 2 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 @@ -92,8 +92,8 @@

/obj/item/reagent_container/hypospray/autoinjector/adrenaline
name = "epinephrine autoinjector"
chemname = "adrenaline"
desc = "An autoinjector loaded with 3 uses of Epinephrine, better known as Adrenaline, a nerve stimulant useful in restarting the heart."
chemname = "adrenaline (concerntrated)"
Warfan1815 marked this conversation as resolved.
Show resolved Hide resolved
desc = "An autoinjector loaded with 3 uses of Epinephrine, better known as Adrenaline, a nerve stimulant useful in restarting the heart. In this concerntrated form, it will prevent unconciousness but will cause minor suffocation."
Warfan1815 marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/storage/pouch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", inner.volume/3)
inner.reagents.add_reagent("adrenaline (concerntrated)", inner.volume/3)
Warfan1815 marked this conversation as resolved.
Show resolved Hide resolved
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", A.volume/3)
A.reagents.add_reagent("adrenaline (concerntrated)", A.volume/3)
Warfan1815 marked this conversation as resolved.
Show resolved Hide resolved
A.reagents.add_reagent("inaprovaline", A.volume/3)
A.reagents.add_reagent("tricordrazine", A.volume/3)
A.update_uses_left()
Expand Down
19 changes: 19 additions & 0 deletions code/modules/reagents/chemistry_properties/prop_special.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,3 +369,22 @@
/datum/chem_property/special/firepenetrating/update_reagent()
holder.fire_penetrating = TRUE
..()

/datum/chem_property/special/revitalizing
name = PROPERTY_REVITALIZING
code = "REV"
description = "For a period of time, revitalizes the main systems of the body and prevents unconciousness."
rarity = PROPERTY_ADMIN
category = PROPERTY_TYPE_STIMULANT
value = 666
var/knocked_out_value_store = 0

/datum/chem_property/special/revitalizing/reagent_added(mob/living/M)
if(!ishuman(M))
return
M.status_flags &= ~CANKNOCKOUT
knocked_out_value_store = M.knocked_out
M.knocked_out = 0

/datum/chem_property/special/revitalizing/on_delete(mob/living/M)
M.status_flags |= CANKNOCKOUT
8 changes: 8 additions & 0 deletions code/modules/reagents/chemistry_reactions/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
required_reagents = list("carbon" = 1, "nitrogen" = 1, "oxygen" = 1)
result_amount = 2

/datum/chemical_reaction/adrenaline
name = "Epinephrine (Concerntrated)"
Warfan1815 marked this conversation as resolved.
Show resolved Hide resolved
id = "adrenaline (concerntrated)"
result = "adrenaline (concerntrated)"
required_reagents = list("carbon" = 1, "nitrogen" = 1, "oxygen" = 1)
required_catalysts = list("phoron" = 5)
result_amount = 1

/datum/chemical_reaction/alkysine
name = "Alkysine"
id = "alkysine"
Expand Down
15 changes: 14 additions & 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 @@ -270,7 +270,7 @@
chemclass = CHEM_CLASS_UNCOMMON
properties = list(PROPERTY_NEOGENETIC = 3)

/datum/reagent/medical/adrenaline
/datum/reagent/medical/adrenaline // Legacy version
name = "Epinephrine"
id = "adrenaline"
description = "A natural muscle and heart stimulant. Useful for restarting the heart. Overdosing may stress the heart and cause tissue damage."
Expand All @@ -283,6 +283,19 @@
properties = list(PROPERTY_PAINKILLING = 1.5, PROPERTY_ELECTROGENETIC = 4, PROPERTY_INTRAVENOUS = 1)
flags = REAGENT_TYPE_MEDICAL | REAGENT_SCANNABLE

/datum/reagent/medical/adrenaline/strong
name = "Epinephrine (Concerntrated)"
Warfan1815 marked this conversation as resolved.
Show resolved Hide resolved
id = "adrenaline (concerntrated)"
description = "A natural muscle and heart stimulant that is in a high concerntration. Useful for restarting the heart and preventing unconciousness but in this concerntrated form it will cause minor suffocation. Overdosing may stress the heart and cause tissue damage."
Warfan1815 marked this conversation as resolved.
Show resolved Hide resolved
reagent_state = LIQUID
color = "FFE702" // Yellow-ish
overdose = LOWM_REAGENTS_OVERDOSE
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)
flags = REAGENT_TYPE_MEDICAL | REAGENT_SCANNABLE

/datum/reagent/medical/ultrazine
name = "Ultrazine"
id = "ultrazine"
Expand Down
Loading