LSD Returns #379
Open
LSD Returns #379
+17
−17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AndroBetel
requested changes
Aug 15, 2024
Doubleumc
reviewed
Aug 16, 2024
|
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. |
Doubleumc
requested changes
Sep 4, 2024
Doubleumc
requested changes
Sep 6, 2024
| @@ -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.
Suggested change
| 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.
Suggested change
| "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.
Suggested change
| 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.
Suggested change
| 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.
Suggested change
| 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.
Suggested change
| required_reagents = list("diethylamide" = 1, "oxygen" = 1, "inaprovaline" = 1) | |
| required_reagents = list("lsd" = 1, "oxygen" = 1, "inaprovaline" = 1) |
Comment on lines
+293
to
+296
| /datum/chemical_reaction/diethylamide | ||
| name = "Lysergic Acid Diethylamide" | ||
| id = "diethylamide" | ||
| result = "diethylamide" |
There was a problem hiding this comment.
Suggested change
| /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.
Suggested change
| id = "diethylamide" | |
| id = "lsd" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary