-
Notifications
You must be signed in to change notification settings - Fork 94
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.
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
LSD Returns #379
base: master
Are you sure you want to change the base?
LSD Returns #379
Conversation
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
unfucks stupid weird commit thing arfgh argh argh thanks dmc Co-authored-by: Doubleumc <[email protected]>
Conflicts have been resolved. A maintainer will review the pull request shortly. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please rename the reagent as per the previous review:
Prefer for this to be typed as
/datum/reagent/toxin/lsd
or similar. People understand what LSD means. Diethylamide is much less clear what it does.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is more what I had in mind by changing its identifier to lsd
.
Otherwise, code good.
@@ -450,7 +450,7 @@ | |||
/obj/item/reagent_container/syringe/drugs/Initialize() | |||
. = ..() | |||
reagents.add_reagent("space_drugs", 5) | |||
reagents.add_reagent("mindbreaker", 5) | |||
reagents.add_reagent("diethylamide", 5) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
reagents.add_reagent("diethylamide", 5) | |
reagents.add_reagent("lsd", 5) |
@@ -245,7 +245,7 @@ var/global/list/gene_tag_masks = list() // Gene obfuscation for delicious tria | |||
"rezadone", | |||
"ethylredoxrazine", | |||
"cyanide", | |||
"mindbreaker", | |||
"diethylamide", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"diethylamide", | |
"lsd", |
rarity = PROPERTY_COMMON | ||
category = PROPERTY_TYPE_STIMULANT | ||
value = 1 | ||
|
||
/datum/chem_property/neutral/antihallucinogenic/process(mob/living/M, potency = 1) | ||
M.reagents.remove_reagent("mindbreaker", 5) | ||
M.reagents.remove_reagent("diethylamide", 5) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
M.reagents.remove_reagent("diethylamide", 5) | |
M.reagents.remove_reagent("lsd", 5) |
@@ -192,19 +192,19 @@ | |||
name = "Methylphenidate" | |||
id = "methylphenidate" | |||
result = "methylphenidate" | |||
required_reagents = list("mindbreaker" = 1, "hydrogen" = 1) | |||
required_reagents = list("diethylamide" = 1, "hydrogen" = 1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
required_reagents = list("diethylamide" = 1, "hydrogen" = 1) | |
required_reagents = list("lsd" = 1, "hydrogen" = 1) |
result_amount = 3 | ||
|
||
/datum/chemical_reaction/citalopram | ||
name = "Citalopram" | ||
id = "citalopram" | ||
result = "citalopram" | ||
required_reagents = list("mindbreaker" = 1, "carbon" = 1) | ||
required_reagents = list("diethylamide" = 1, "carbon" = 1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
required_reagents = list("diethylamide" = 1, "carbon" = 1) | |
required_reagents = list("lsd" = 1, "carbon" = 1) |
result_amount = 3 | ||
|
||
/datum/chemical_reaction/paroxetine | ||
name = "Paroxetine" | ||
id = "paroxetine" | ||
result = "paroxetine" | ||
required_reagents = list("mindbreaker" = 1, "oxygen" = 1, "inaprovaline" = 1) | ||
required_reagents = list("diethylamide" = 1, "oxygen" = 1, "inaprovaline" = 1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
required_reagents = list("diethylamide" = 1, "oxygen" = 1, "inaprovaline" = 1) | |
required_reagents = list("lsd" = 1, "oxygen" = 1, "inaprovaline" = 1) |
/datum/chemical_reaction/diethylamide | ||
name = "Lysergic Acid Diethylamide" | ||
id = "diethylamide" | ||
result = "diethylamide" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/datum/chemical_reaction/diethylamide | |
name = "Lysergic Acid Diethylamide" | |
id = "diethylamide" | |
result = "diethylamide" | |
/datum/chemical_reaction/lsd | |
name = "Lysergic Acid Diethylamide" | |
id = "lsd" | |
result = "lsd" |
description = "A powerful hallucinogenic compound that is illegal under space law. Causes extreme hallucinations and is very addictive. Formerly known as LSD." | ||
/datum/reagent/toxin/lsd | ||
name = "lysergic acid diethylamide" | ||
id = "diethylamide" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
id = "diethylamide" | |
id = "lsd" |
Summary