Skip to content

Commit

Permalink
you asked you got it.
Browse files Browse the repository at this point in the history
  • Loading branch information
KoishiVibe committed Aug 15, 2024
1 parent fe00da5 commit abc8a30
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
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)
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",
"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)
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)
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)
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)
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"
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/diethylamide
name = "lysergic acid diethylamide"
id = "diethylamide"
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

0 comments on commit abc8a30

Please sign in to comment.