-
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
Changes from all commits
de6c369
2b6c465
8ea6f23
1e582ef
38aee5f
b69183d
d5078fe
edf2ede
a361ab2
0f713b9
115e852
f0b4d03
017baf3
3be565c
9698a01
c040c59
d681f97
71341c8
fe00da5
abc8a30
ca26921
42f2363
4cf57fe
ad617c2
15835c4
cef5e1e
a416f4c
1a5825c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -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 commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
"stoxin" | ||||||
) | ||||||
|
||||||
|
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -437,13 +437,13 @@ | |||||
/datum/chem_property/neutral/antihallucinogenic | ||||||
name = PROPERTY_ANTIHALLUCINOGENIC | ||||||
code = "AHL" | ||||||
description = "Stabilizes perseptive abnormalities such as hallucinations caused by mindbreaker toxin." | ||||||
description = "Stabilizes perseptive abnormalities such as those caused by hallucinogenics like LSD or certain fungi." | ||||||
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 commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
M.reagents.remove_reagent("space_drugs", 5) | ||||||
M.hallucination = max(0, M.hallucination - POTENCY_MULTIPLIER_EXTREME * potency) | ||||||
M.druggy = max(0, M.druggy - POTENCY_MULTIPLIER_EXTREME * potency) | ||||||
|
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -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 commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
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 commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
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 commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
result_amount = 3 |
Original file line number | Diff line number | Diff line change | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -290,10 +290,10 @@ | |||||||||||||||||
required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1) | ||||||||||||||||||
result_amount = 3 | ||||||||||||||||||
|
||||||||||||||||||
/datum/chemical_reaction/mindbreaker | ||||||||||||||||||
name = "Mindbreaker Toxin" | ||||||||||||||||||
id = "mindbreaker" | ||||||||||||||||||
result = "mindbreaker" | ||||||||||||||||||
/datum/chemical_reaction/diethylamide | ||||||||||||||||||
name = "Lysergic Acid Diethylamide" | ||||||||||||||||||
id = "diethylamide" | ||||||||||||||||||
result = "diethylamide" | ||||||||||||||||||
Comment on lines
+293
to
+296
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||
required_reagents = list("silicon" = 1, "hydrogen" = 1, "anti_toxin" = 1) | ||||||||||||||||||
result_amount = 3 | ||||||||||||||||||
|
||||||||||||||||||
|
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -129,10 +129,10 @@ | |||||
holder_mob.status_flags &= ~FAKEDEATH | ||||||
REMOVE_TRAIT(holder_mob, TRAIT_IMMOBILIZED, FAKEDEATH_TRAIT) | ||||||
|
||||||
/datum/reagent/toxin/mindbreaker | ||||||
name = "Mindbreaker Toxin" | ||||||
id = "mindbreaker" | ||||||
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" | ||||||
KoishiVibe marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
id = "diethylamide" | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
description = "Lysergic acid diethylamide is a potent hallucinogenic agent which is considered nonaddictive, though potentially capable of causing permanent psychological changes." | ||||||
reagent_state = LIQUID | ||||||
color = "#B31008" // rgb: 139, 166, 233 | ||||||
overdose = REAGENTS_OVERDOSE | ||||||
|
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.