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.

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

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
de6c369
fuck that shit
Jun 2, 2024
2b6c465
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 2, 2024
8ea6f23
emails
Jun 2, 2024
1e582ef
should hopefully accidently unfuck this
Jun 2, 2024
38aee5f
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Jun 3, 2024
b69183d
FUCK.
Jun 6, 2024
d5078fe
unfucks that.
Jun 6, 2024
edf2ede
try to fix the problem
Jun 6, 2024
a361ab2
i dont know why hpefully fixed????
Jun 6, 2024
0f713b9
hopefully fixed wait no this needs to mathc
Jun 6, 2024
115e852
done
KoishiVibe Jun 13, 2024
f0b4d03
fucking fix you piece of shit
Jun 20, 2024
017baf3
undoes a fuckup with the master
Jun 22, 2024
3be565c
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 22, 2024
9698a01
fixes issue
Jun 22, 2024
c040c59
how tf did this get changed
KoishiVibe Jun 25, 2024
d681f97
flask draftoid
KoishiVibe Aug 13, 2024
71341c8
mre obliteration
KoishiVibe Aug 13, 2024
fe00da5
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Aug 14, 2024
abc8a30
you asked you got it.
Aug 15, 2024
ca26921
fixed master branch mistakes
Aug 15, 2024
42f2363
Update code/game/objects/items/reagent_containers/food/drinks.dm
KoishiVibe Aug 21, 2024
4cf57fe
Merge branch 'master' into sovul-droogs
KoishiVibe Aug 21, 2024
ad617c2
Merge branch 'master' into sovul-droogs
KoishiVibe Aug 25, 2024
15835c4
Merge branch 'cmss13-devs:master' into sovul-droogs
KoishiVibe Aug 31, 2024
cef5e1e
Merge branch 'master' into sovul-droogs
KoishiVibe Sep 5, 2024
a416f4c
changes the base path to LSD
Sep 5, 2024
1a5825c
Merge branch 'master' into sovul-droogs
KoishiVibe Sep 7, 2024
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
2 changes: 1 addition & 1 deletion code/game/objects/items/reagent_containers/syringes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
reagents.add_reagent("diethylamide", 5)
reagents.add_reagent("lsd", 5)

reagents.add_reagent("cryptobiolin", 5)
mode = SYRINGE_INJECT
update_icon()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/seed_datums.dm
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ var/global/list/gene_tag_masks = list() // Gene obfuscation for delicious tria
"rezadone",
"ethylredoxrazine",
"cyanide",
"mindbreaker",
"diethylamide",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"diethylamide",
"lsd",

"stoxin"
)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/law/laws/major_crime.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/datum/law/major_law/contraband
name = "Contraband"
desc = "Possessing, or distributing controlled substances or unauthorized items or weapons as defined in Standard Operating Procedure or impairing, intoxicating or addictive drugs such as Mindbreaker, this does not include custom mixes or dosages of medicinal drugs."
desc = "Possessing, or distributing controlled substances or unauthorized items or weapons as defined in Standard Operating Procedure or impairing, intoxicating or addictive drugs such as LSD, this does not include custom mixes or dosages of medicinal drugs."
special_punishment = "Contraband Confiscation"
brig_time = 15

Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/paper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@

/obj/item/paper/bigred/smuggling
name = "Folded note"
info = "Alright Jeff, I know you still owe me after standing up for you when you got caught with a whole pill bottle of mindbreaker. Remember how I got you out of 15 years in the slammer? \n Anyways, I have a special task for you that you can do to repay me. \n <p> Whenever you unload a cargo container look for any crate with a blue hexagon on it. </p> <p>Upon finding one, DO NOT OPEN it under ANY circumstances, and keep it away from anyone else. You then bring it to virology, specifically the back of the lobby where there is a hole into the caves. </p> \n <p> Then, leave it at the nearest crevice to the right and my men will take it. Should there be any backup, just stack it on top.</p> \n<p> Easy, right? Just moving cargo. If anyone asks what’s in it, it’s just power tools. </p> \n <p> Good luck, I'll slide you a few blunts of space weed that we have as a tip if you work well. </p>"
info = "Alright Jeff, I know you still owe me after standing up for you when you got caught with a whole pill bottle of LSD. Remember how I got you out of 15 years in the slammer? \n Anyways, I have a special task for you that you can do to repay me. \n <p> Whenever you unload a cargo container look for any crate with a blue hexagon on it. </p> <p>Upon finding one, DO NOT OPEN it under ANY circumstances, and keep it away from anyone else. You then bring it to virology, specifically the back of the lobby where there is a hole into the caves. </p> \n <p> Then, leave it at the nearest crevice to the right and my men will take it. Should there be any backup, just stack it on top.</p> \n<p> Easy, right? Just moving cargo. If anyone asks what’s in it, it’s just power tools. </p> \n <p> Good luck, I'll slide you a few blunts of space weed that we have as a tip if you work well. </p>"
color = "grey"

/obj/item/paper/bigred/witness
Expand Down
4 changes: 2 additions & 2 deletions code/modules/reagents/chemistry_properties/prop_neutral.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
M.reagents.remove_reagent("diethylamide", 5)
M.reagents.remove_reagent("lsd", 5)

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)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/reagents/chemistry_reactions/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -192,19 +192,19 @@
name = "Methylphenidate"
id = "methylphenidate"
result = "methylphenidate"
required_reagents = list("mindbreaker" = 1, "hydrogen" = 1)
required_reagents = list("diethylamide" = 1, "hydrogen" = 1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
required_reagents = list("diethylamide" = 1, "oxygen" = 1, "inaprovaline" = 1)
required_reagents = list("lsd" = 1, "oxygen" = 1, "inaprovaline" = 1)

result_amount = 3
8 changes: 4 additions & 4 deletions code/modules/reagents/chemistry_reactions/other.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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"

required_reagents = list("silicon" = 1, "hydrogen" = 1, "anti_toxin" = 1)
result_amount = 3

Expand Down
8 changes: 4 additions & 4 deletions code/modules/reagents/chemistry_reagents/toxin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
id = "diethylamide"
id = "lsd"

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
Expand Down
Loading