diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm index 176c565ec0..964998a8dd 100644 --- a/code/__defines/chemistry.dm +++ b/code/__defines/chemistry.dm @@ -46,7 +46,7 @@ #define ANTIBIO_SUPER 3 // Chemistry lists. -var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine", "ecstasy") // Increase heart rate. +var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine", "bliss") // Increase heart rate. var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "ambrosia_extract", "stoxin") // Decrease heart rate. var/list/heartstopper = list("potassium_chlorophoride", "zombie_powder") // This stops the heart. var/list/cheartstopper = list("potassium_chloride") // This stops the heart when overdose is met. -- c = conditional diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index a10ada702b..c52e51d5b5 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -1081,8 +1081,8 @@ datum return 0 drugs - steal_target = /datum/reagent/drugs/ecstasy - explanation_text = "Steal some ecstasy." + steal_target = /datum/reagent/drugs/bliss + explanation_text = "Steal some bliss." weight = 40 get_points(var/job) diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 3648015385..775729f77b 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -21,7 +21,7 @@ /obj/item/weapon/reagent_containers/glass/beaker/vial/random/toxin random_reagent_list = list( - list("mindbreaker" = 10, "ecstasy" = 20) = 3, + list("mindbreaker" = 10, "bliss" = 20) = 3, list("carpotoxin" = 15) = 2, list("impedrezene" = 15) = 2, list("zombiepowder" = 10) = 1) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 761160601d..abdb53bf56 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -155,7 +155,7 @@ to_chat(user, "There's visible lag between left and right pupils' reactions.") var/list/pinpoint = list("oxycodone"=1,"tramadol"=5) - var/list/dilating = list("ecstasy"=5,"ambrosia_extract"=5,"mindbreaker"=1) + var/list/dilating = list("bliss"=5,"ambrosia_extract"=5,"mindbreaker"=1) if(M.reagents.has_any_reagent(pinpoint) || H.ingested.has_any_reagent(pinpoint)) to_chat(user, "\The [M]'s pupils are already pinpoint and cannot narrow any more.") else if(M.reagents.has_any_reagent(dilating) || H.ingested.has_any_reagent(dilating)) diff --git a/code/game/objects/random/unidentified/medicine.dm b/code/game/objects/random/unidentified/medicine.dm index cf6236a436..1c9e7c3bb7 100644 --- a/code/game/objects/random/unidentified/medicine.dm +++ b/code/game/objects/random/unidentified/medicine.dm @@ -32,7 +32,7 @@ much more likely to show up. This is done for several purposes; /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified, /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified, /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/ecstasy/unidentified, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified, /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified, /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified, /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified, @@ -108,7 +108,7 @@ much more likely to show up. This is done for several purposes; prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified, prob(40);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified, prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified, - prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/ecstasy/unidentified, + prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified, prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified, prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified, prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified, diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index d544c33931..a31c20954f 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -3750,7 +3750,7 @@ reagents.add_reagent("oxycodone", 1) reagents.add_reagent("sifsap", 5) - reagents.add_reagent("ecstasy", 5) + reagents.add_reagent("bliss", 5) /obj/item/weapon/reagent_containers/food/snacks/bellefritter name = "frostbelle fritters" diff --git a/code/modules/food/food/thecake.dm b/code/modules/food/food/thecake.dm index 28cfbae842..d10cb35a4a 100644 --- a/code/modules/food/food/thecake.dm +++ b/code/modules/food/food/thecake.dm @@ -201,7 +201,7 @@ desc = "A mysterious slice, coated in purple frosting that smells like grapes." nutriment_desc = list("The desire to show off an party" = 10) reagents.add_reagent("stoxin", 2) - reagents.add_reagent("ecstasy", 10) + reagents.add_reagent("bliss", 10) reagents.add_reagent("serotrotium", 4) reagents.add_reagent("cryptobiolin", 8) reagents.add_reagent("mindbreaker", 10) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 42b2e363ba..919b4ac447 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -92,7 +92,7 @@ descriptors |= "radioactive" if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin")) descriptors |= "poisonous" - if(reagents.has_reagent("psilocybin") || reagents.has_reagent("ecstasy")) + if(reagents.has_reagent("psilocybin") || reagents.has_reagent("bliss")) descriptors |= "hallucinogenic" if(reagents.has_reagent("bicaridine")) descriptors |= "medicinal" diff --git a/code/modules/hydroponics/seedtypes/mushrooms.dm b/code/modules/hydroponics/seedtypes/mushrooms.dm index c9ec154f5e..4be5e0fb31 100644 --- a/code/modules/hydroponics/seedtypes/mushrooms.dm +++ b/code/modules/hydroponics/seedtypes/mushrooms.dm @@ -80,7 +80,7 @@ seed_name = "liberty cap" display_name = "liberty cap mushrooms" mutants = null - chems = list("nutriment" = list(1), "stoxin" = list(3,3), "ecstasy" = list(1,25)) + chems = list("nutriment" = list(1), "stoxin" = list(3,3), "bliss" = list(1,25)) /datum/seed/mushroom/hallucinogenic/strong/New() ..() diff --git a/code/modules/library/hardcode_library/fiction/PortedBooks.dm b/code/modules/library/hardcode_library/fiction/PortedBooks.dm index e90d36ff53..737338f5b8 100644 --- a/code/modules/library/hardcode_library/fiction/PortedBooks.dm +++ b/code/modules/library/hardcode_library/fiction/PortedBooks.dm @@ -46,39 +46,39 @@ Category: Fiction

- Once upon a time there was a cat, but he wasnt the kind of cat youre thinking of. He was from the land of the fairies and his fur was completely unexpected colors. For starters, his nose was violet. His eyes were indigo, his ears were sky blue, his front paws were green, his body was yellow, his back paws were orange, and his tail was red. So he was a mysterious cat of seven colors arranged just like a rainbow. + Once upon a time there was a cat, but he wasn�t the kind of cat you�re thinking of. He was from the land of the fairies and his fur was completely unexpected colors. For starters, his nose was violet. His eyes were indigo, his ears were sky blue, his front paws were green, his body was yellow, his back paws were orange, and his tail was red. So he was a mysterious cat of seven colors arranged just like a rainbow.

That rainbow cat went on all sorts of strange adventures. The following story is one of them.

One day while the rainbow cat was sunbathing, he was suddenly vexed by boredom. That is to say, peace reigned in the land of the fairies, so nothing much was going on.

- Its not good for my health to spend all my time idling about as if I havent got a care in the world, he thought. Perhaps I should head out and go on an adventure. + It�s not good for my health to spend all my time idling about as if I haven�t got a care in the world, he thought. Perhaps I should head out and go on an adventure.

So he put a note up on his door: "Dear Mr. Post Man, I will be gone for two or three days, so if any packages or letters come, please throw them down the chimney."

Then he packed a small bag, hung it on his tail, and wobbled off to the border of the land of the fairies. When he arrived, a thick cloud billowed up.

- "Well, maybe Ill drop by the cloud peoples place," he chattered to himself, climbing up the cloud embankment. + "Well, maybe I�ll drop by the cloud people�s place," he chattered to himself, climbing up the cloud embankment.

- The people who lived in cloud country were quite pleasant folks. They didnt do any work, in particular, but just because they were lazy didnt mean that they didnt find the world interesting. They all lived in splendid palaces, of which the ones you couldnt see from Earth were far more beautiful than the ones you could. + The people who lived in cloud country were quite pleasant folks. They didn�t do any work, in particular, but just because they were lazy didn�t mean that they didn�t find the world interesting. They all lived in splendid palaces, of which the ones you couldn�t see from Earth were far more beautiful than the ones you could.

- The people of the cloud country sometimes drove pearly gray carriages or went sailing in lightweight boats. They lived in the sky, so the only person they had to fear was Sir Thunder. Its quite understandable given that he was quick to anger -- he would make the sky rumble with his stomping and go around knocking down their houses. + The people of the cloud country sometimes drove pearly gray carriages or went sailing in lightweight boats. They lived in the sky, so the only person they had to fear was Sir Thunder. It�s quite understandable given that he was quick to anger -- he would make the sky rumble with his stomping and go around knocking down their houses.

The people of the cloud country were very happy to have the rainbow cat visit and greeted him politely.

- "Youve come at a great time," they said. "Were having a big celebration at the Wind Gods house. His eldest son, North Wind is taking the daughter of the King of the Magic Isle as his wife." + "You�ve come at a great time," they said. "We�re having a big celebration at the Wind God�s house. His eldest son, North Wind is taking the daughter of the King of the Magic Isle as his wife."

The rainbow cat, having thought just such a thing might happen, was prepared with various goods in the bag on his tail.

It was a truly magnificent wedding.

- Everyone came. Even Comet showed up. You wouldnt see Comet unless it was a very fine banquet indeed. + Everyone came. Even Comet showed up. You wouldn�t see Comet unless it was a very fine banquet indeed.

- And Aurora came in the most indescribably beautiful garments of light. Of course, the brides parents, the King of Magic Isle and his Pearl Oyster Queen, were in attendance. + And Aurora came in the most indescribably beautiful garments of light. Of course, the bride�s parents, the King of Magic Isle and his Pearl Oyster Queen, were in attendance.

- A feast was served and everyone was in a lively mood, having interesting conversations and drinking, when all of the sudden a swallow flew in. According to him, the giant Sir Thunder was rushing towards them at a tremendous speed. Apparently, when Trade Wind was hurrying by, he had tripped over sleeping Sir Thunders toes and Sir Thunder was furious. + A feast was served and everyone was in a lively mood, having interesting conversations and drinking, when all of the sudden a swallow flew in. According to him, the giant Sir Thunder was rushing towards them at a tremendous speed. Apparently, when Trade Wind was hurrying by, he had tripped over sleeping Sir Thunder�s toes and Sir Thunder was furious.

- "Whatll we do?" everyone wondered at once, their faces pale. "The celebration will be ruined!" + "What�ll we do?" everyone wondered at once, their faces pale. "The celebration will be ruined!"

All the guests and the master of the house began to scatter in a panic.

@@ -88,9 +88,9 @@ Category: Fiction

A moment later, he came back out.

- "Ill find a way to keep Sir Thunder from coming here," said the cat. "So please continue the celebration as you were. Ill go to him and see what I can do." + "I�ll find a way to keep Sir Thunder from coming here," said the cat. "So please continue the celebration as you were. I�ll go to him and see what I can do."

- Everyone was surprised at how brave and composed the rainbow cat was, but it sounded like their celebration wouldnt be intruded upon partway through, so they were happy to gather and see off the cat as he raced towards the far-off rumblings of Sir Thunder. + Everyone was surprised at how brave and composed the rainbow cat was, but it sounded like their celebration wouldn�t be intruded upon partway through, so they were happy to gather and see off the cat as he raced towards the far-off rumblings of Sir Thunder.

@@ -111,21 +111,21 @@ Category: Fiction

"Hey, who are you and what are you doing here?" he shouted.

- "Me? Im the famed magician Mewpuu," replied the rainbow cat in a voice made to sound serious and important. "Take a look at my bag, here. There are magic seeds inside. Mr. Thunder, Ive known about you for a while now. Youre quite famous." + "Me? I�m the famed magician Mewpuu," replied the rainbow cat in a voice made to sound serious and important. "Take a look at my bag, here. There are magic seeds inside. Mr. Thunder, I�ve known about you for a while now. You�re quite famous."

Hearing this Sir Thunder felt a bit proud, but his foot was sore, so he was soon angry again.

- "Hrmph! I dont think too highly of magicians. What can you do, anyways?" + "Hrmph! I don�t think too highly of magicians. What can you do, anyways?"

"I can read your mind."

- "Oh? Is that so? Then try to guess what Im thinking right now." + "Oh? Is that so? Then try to guess what I�m thinking right now."

- "A simple matter. Youre angry because your foot hurts and you want to catch the fellow who kicked your blister, right?" + "A simple matter. You�re angry because your foot hurts and you want to catch the fellow who kicked your blister, right?"

The rainbow cat had heard all that from the swallow. Sir Thunder was flabbergasted.

- "Wow, thats right. Will you teach me your magic?" + "Wow, that�s right. Will you teach me your magic?"

"Sure I will. But first I must test your potential. Have a seat."

@@ -133,35 +133,35 @@ Category: Fiction

"Now then, try to tell me what I am thinking right now," said the cat.

- Sir Thunder the giant looked blankly at the cats face. He was not very bright. + Sir Thunder the giant looked blankly at the cat�s face. He was not very bright.

"You must be thinking that I look pretty foolish sitting here."

"Excellent. Astonishing! You have more than enough talent to begin the training. You may be my brightest disciple yet."

- "Then maybe Ill try one more time." Sir Thunder now thought himself terribly sharp. + "Then maybe I�ll try one more time." Sir Thunder now thought himself terribly sharp.

- "Very well. Try to guess what Im thinking." + "Very well. Try to guess what I�m thinking."

- Sir Thunder tried to look wise and peered at the cats face with his small, goofy eyes. + Sir Thunder tried to look wise and peered at the cat�s face with his small, goofy eyes.

"Beef steak and onions," he announced abruptly.

- "Brilliant!" the cat feigned surprise and purposely lost his footing to land on his rump. "Youre exactly right. But how did you know?" + "Brilliant!" the cat feigned surprise and purposely lost his footing to land on his rump. "You�re exactly right. But how did you know?"

"Oh, how do you say...? I guess it just came to me," replied Sir Thunder.

The cat assumed a serious air. "We must cultivate that fine talent of yours!"

- "How do we cultivate it?" asked Sir Thunder. He thought being able to read peoples minds was quite fun. + "How do we cultivate it?" asked Sir Thunder. He thought being able to read people�s minds was quite fun.

- "Its a cinch," said the cat, finally telling a blatant lie now that he thought he had the giant where he wanted him. "Go home and sleep for two or three hours. Then have some cake and sleep another two or three hours. Then, when you wake up, drink one cup of hot tea. But you have to be as still as possible or it wont work. If you do all that, by tomorrow morning youll be reading peoples minds like its nothing." + "It�s a cinch," said the cat, finally telling a blatant lie now that he thought he had the giant where he wanted him. "Go home and sleep for two or three hours. Then have some cake and sleep another two or three hours. Then, when you wake up, drink one cup of hot tea. But you have to be as still as possible or it won�t work. If you do all that, by tomorrow morning you�ll be reading people�s minds like it�s nothing."

- Sir Thunder wanted to go running straight home, but of course, he couldnt forget his manners. "Thanks a lot. But Master Mewpuu, what can I offer you in return for teaching me this?" + Sir Thunder wanted to go running straight home, but of course, he couldn�t forget his manners. "Thanks a lot. But Master Mewpuu, what can I offer you in return for teaching me this?"

- The rainbow cat thought a moment and said, "Id like a tiny bit of lightning. Please give me just a smidge." + The rainbow cat thought a moment and said, "I�d like a tiny bit of lightning. Please give me just a smidge."

- Sir Thunder the giant put his hand in his pocket and said, "No problem. If thats all, I have a bundle of it right here, so please take this. When you need it, just undo the string and the lightning will come out in a most amusing way." + Sir Thunder the giant put his hand in his pocket and said, "No problem. If that�s all, I have a bundle of it right here, so please take this. When you need it, just undo the string and the lightning will come out in a most amusing way."

"Thank you very much."

@@ -285,7 +285,7 @@ Category: Fiction Those that I fight I do not hate
Those that I guard I do not love;
My country is Kiltartan Cross,
- My countrymen Kiltartans poor,
+ My countrymen Kiltartan�s poor,
No likely end could bring them loss
Or leave them happier than before.
Nor law, nor duty bade me fight,
@@ -414,10 +414,10 @@ Category: Fiction But limped on, blood-shod. All went lame; all blind;
Drunk with fatigue; deaf even to the hoots
Of gas-shells dropping softly behind.

- Gas! GAS! Quick, boys! -- An ecstasy of fumbling
+ Gas! GAS! Quick, boys! -- An bliss of fumbling
Fitting the clumsy helmets just in time,
But someone still was yelling out and stumbling
- And floundring like a man in fire or lime.--
+ And flound�ring like a man in fire or lime.--
Dim through the misty panes and thick green light,
As under a green sea, I saw him drowning.

In all my dreams before my helpless sight,
@@ -425,7 +425,7 @@ Category: Fiction If in some smothering dreams, you too could pace
Behind the wagon that we flung him in,
And watch the white eyes writhing in his face,
- His hanging face, like a devils sick of sin;
+ His hanging face, like a devil�s sick of sin;
If you could hear, at every jolt, the blood
Come gargling from the froth-corrupted lungs,
Obscene as cancer, bitter as the cud
@@ -612,13 +612,13 @@ Category: Fiction
- "I wonder where they might be taking shelter from the storm. There is no where else to go in this wide, wide ocean. They must have sunk...

+ "I wonder where they might be taking shelter from the storm. There is no where else to go in this wide, wide ocean. They must have sunk...��

The first fisherman had started to worry as the stormy night turned to complete darkness. Whenever he looked out, the waves of the ocean were winding into the skies above. He could see no sign of a boat. The first fisherman had been abandoned on the small, deserted island. He stood on the rocks of the shore and waited a full day for his friends to return. But perhaps because the winds from yesterday had made the ocean rough, the sun that day went down without any sign of the boat he had been waiting for.

Three days passed. The first fisherman had started to grow weak. Finally, after standing on the beach looking intently out over the ocean for three days, the boat carrying his friends cut through the waves and sailed towards the beach. It felt like a thousand years since he had seen them last. He could see that the second fisherman and the third fisherman were fine and moving about on the boat.

"Hey!" the first fisherman called out over the water, raising both of his hands high in the air. When he did, it looked like they too had thrown their hands in the air and called back. Only he couldn't hear their voices. Just then as the setting sun illuminated the tips of the waves, the two fishermen on the boat came into sight, red in the face.

"Ahh, here's a sight for sore eyes, my two friends! They made it back alive," said the first fisherman, warm tears of joy swelling in his eyes. Before long the boat was nearly on the sand.

"Hey!" the first fisherman called out, his hand in the air. He thought the other to fishermen would respond, but just as the pair were about to turn to the side and bring their boat in, they disappeared like a puff of smoke. The first fisherman was shocked.

- "A ghost ship! + "A ghost ship!�

III
@@ -634,8 +634,8 @@ Category: Fiction
The first fisherman lost all hope, threw himself down on the sand and began to cry. His imagination was running wild, and his nightmares ran through the night. When he awoke the next morning his eyes were blood-shot and his heart was pounding. It was just past midday. The first fisherman raised his head and looked out over the sea only to spot the same boat in the distance. But it was the same as yesterday, a ghost ship, that had come to the island. For a moment he was relieved, and happiness danced in his chest, but in the next instant his body shook with fear.

- "Damn it. Are they trying to kill me? said the first fisherman, as he started to lose his mind. The boat cut through the waves and came in closer and closer to the island. The first fisherman pulled out his pistol, aimed at the boat and pulled the trigger. But this time the boat wasn't a ghost, and it didn't disappear. Once the boat was docked at the beach, the two other fishermen scrambled up onto land.

- "Have you gone completely mad? yelled one, which was enough to snap the first fisherman back to reality.

+ "Damn it. Are they trying to kill me?� said the first fisherman, as he started to lose his mind. The boat cut through the waves and came in closer and closer to the island. The first fisherman pulled out his pistol, aimed at the boat and pulled the trigger. But this time the boat wasn't a ghost, and it didn't disappear. Once the boat was docked at the beach, the two other fishermen scrambled up onto land.

+ "Have you gone completely mad?�� yelled one, which was enough to snap the first fisherman back to reality.

The first fisherman had gone completely mad. That night the winds had caused the boat to be pushed back against a nearby island. Once the waves had died down, the two fishermen went back to the island to rescue their friend. The two fishermen got their crazy friend back on the boat and returned to the mainland. The pair cared for their weakened friend, and through their care he was able to lose his madness and returned to how he used to be. And from there the three friends went on to be even better friends for a very long time. This story is still told in the harbors to the north where the head of that deserted island still pokes up from between those blue black waves.

IV
diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm index 648579c8eb..0fa94d5411 100644 --- a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm +++ b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm @@ -134,7 +134,7 @@ // ==== /datum/medical_effect/itch name = "Itch" - triggers = list("ecstasy" = 10) + triggers = list("bliss" = 10) cures = list("inaprovaline") cure_message = "The itching stops..." diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/modules/mob/living/carbon/human/chem_side_effects.dm index 648579c8eb..0fa94d5411 100644 --- a/code/modules/mob/living/carbon/human/chem_side_effects.dm +++ b/code/modules/mob/living/carbon/human/chem_side_effects.dm @@ -134,7 +134,7 @@ // ==== /datum/medical_effect/itch name = "Itch" - triggers = list("ecstasy" = 10) + triggers = list("bliss" = 10) cures = list("inaprovaline") cure_message = "The itching stops..." diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index ddf484f704..9c274eaf75 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -82,10 +82,10 @@ required_reagents = list("aluminum" = 1, "iron" = 1, "oxygen" = 1) result_amount = 3 -/decl/chemical_reaction/instant/ecstasy - name = "ecstasy" - id = "ecstasy" - result = "ecstasy" +/decl/chemical_reaction/instant/bliss + name = "bliss" + id = "bliss" + result = "bliss" required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1) result_amount = 3 @@ -1066,7 +1066,7 @@ name = "Talum-quem" id = "talum_quem" result = "talum_quem" - required_reagents = list("ecstasy" = 2, "sugar" = 1, "amatoxin" = 1) + required_reagents = list("bliss" = 2, "sugar" = 1, "amatoxin" = 1) result_amount = 4 /decl/chemical_reaction/instant/qerr_quem diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 270be2e29c..ce1a67f5aa 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -286,11 +286,11 @@ This one is filled with serotrotium, which causes concentrated production of the serotonin neurotransmitter in humans." filled_reagents = list("serotrotium" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/ecstasy +/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bliss name = "illicit injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one contains various drugs, held inside a hypospray to make smuggling easier." - filled_reagents = list("ecstasy" = 15) + filled_reagents = list("bliss" = 15) /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin name = "cryptobiolin injector" diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 145c989822..e07a9f7e74 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -317,7 +317,7 @@ /obj/item/weapon/reagent_containers/pill/happy/Initialize() . = ..() - reagents.add_reagent("ecstasy", 15) + reagents.add_reagent("bliss", 15) reagents.add_reagent("sugar", 15) color = reagents.get_color() diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 70a74ffe86..a14df36986 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -368,7 +368,7 @@ /obj/item/weapon/reagent_containers/syringe/drugs/Initialize() . = ..() - reagents.add_reagent("ecstasy", 5) + reagents.add_reagent("bliss", 5) reagents.add_reagent("mindbreaker", 5) reagents.add_reagent("cryptobiolin", 5) mode = SYRINGE_INJECT diff --git a/code/modules/reagents/reagent_containers/unidentified_hypospray.dm b/code/modules/reagents/reagent_containers/unidentified_hypospray.dm index 89bd1760cb..cf57cb4b34 100644 --- a/code/modules/reagents/reagent_containers/unidentified_hypospray.dm +++ b/code/modules/reagents/reagent_containers/unidentified_hypospray.dm @@ -58,7 +58,7 @@ init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/ecstasy/unidentified +/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified init_hide_identity = TRUE flags = 0 diff --git a/code/modules/reagents/reagents/drugs.dm b/code/modules/reagents/reagents/drugs.dm index 5a8714553a..2df4c6f8a3 100644 --- a/code/modules/reagents/reagents/drugs.dm +++ b/code/modules/reagents/reagents/drugs.dm @@ -1,4 +1,7 @@ +/* /// Recreational and psychiatric drugs go here! Please keep them separated in the file. +/// Due to concerns and safety for our repo, illegal real-world drug names should generally be avoided. +*/ /datum/reagent/drugs name = "generic drugs" @@ -36,10 +39,10 @@ if(prob(5) && prob_proc == FALSE) /// Enables procs to activate, remains true until THAT PROC sets it to false again. prob_proc = TRUE -/datum/reagent/drugs/ecstasy /// Replaces Space Drugs. - name = "Ecstasy" - id = "ecstasy" - description = "Also known as MDMA or simply \"E\", this psychoactive drug is often used recreationally." +/datum/reagent/drugs/bliss /// Replaces Space Drugs. + name = "Bliss" + id = "bliss" + description = "Known for providing a euphoric high, this psychoactive drug is often used recreationally." taste_description = "unpleasant bitterness" taste_mult = 0.4 high_message_list = list("You don't quite know what up or down is anymore...", @@ -52,7 +55,7 @@ "Colors seem... flatter.", "Everything feels a little dull, now.") -/datum/reagent/drugs/ecstasy/affect_blood(mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/drugs/bliss/affect_blood(mob/living/carbon/M, var/alien, var/removed) ..() var/drug_strength = 15 if(alien == IS_SKRELL) @@ -68,7 +71,7 @@ M.emote(pick("twitch", "drool", "moan", "giggle")) prob_proc = FALSE -/datum/reagent/drugs/ecstasy/overdose(var/mob/living/M as mob) +/datum/reagent/drugs/bliss/overdose(var/mob/living/M as mob) if(prob_proc == TRUE && prob(20)) M.hallucination = max(M.hallucination, 5) prob_proc = FALSE @@ -203,61 +206,6 @@ color = "#181818" high_messages = FALSE -/datum/reagent/drugs/cocaine - name = "Cocaine" - id = "cocaine" - description = "A recreational drug known for its sharp, but short, energy boost." - taste_description = "numbing powder" - color = "#FFFFFF" - high_message_list = list("You feel euphoric!", - "You feel like you can take on the world!", - "You sniffle compulsively...", - "You feel terrible.", - "Your tongue feels very dry.", - "Your eyes feel dry.") - sober_message_list = list("The world seems slower...", "Everything feels so much more annoying!") - - var/painkiller_str = 3 - -/datum/reagent/drugs/cocaine/affect_blood(mob/living/carbon/M, alien, removed) - ..() - M.add_chemical_effect(CE_PAINKILLER, painkiller_str) - if(prob(7) && prob_proc == TRUE) - M.emote(pick("shiver", "sniff")) - prob_proc = FALSE - -/datum/reagent/drugs/cocaine/overdose(mob/living/carbon/M, alien, removed) - ..() - if(prob(50) && prob_proc == TRUE) - M.vomit() - M.adjustToxLoss(10) - M.adjustBrainLoss(5) - -/datum/reagent/drugs/cocaine/crack - name = "Crack" - id = "crack" - description = "A cheaper and less pure version of cocaine, it carries similar properties with worse side effects." - taste_description = "car fuel" - overdose = 15 - high_message_list = list("You sniffle a bit.", - "You have a mild... headache", - "You feel a bit sick...", - "You feel hyper and confident", - "You feel terrible.") - - painkiller_str = 1 - -/datum/reagent/drugs/cocaine/crack/affect_blood(mob/living/carbon/M, alien, removed) - ..() - M.adjustBrainLoss(0.30) - -/datum/reagent/drugs/cocaine/crack/overdose(mob/living/carbon/M, alien, removed) - ..() - M.drowsyness = max(M.drowsyness, 10) - if(prob(50) && prob_proc == TRUE) - M.adjustToxLoss(10) /// Extra chance for toxloss. - prob_proc = FALSE - /*/////////////////////////////////////////////////////////////////////////// /// PSYCHIATRIC DRUGS ///// /// ///// diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm index 38f40399a5..5e0c08b8e2 100644 --- a/code/modules/virus2/effect.dm +++ b/code/modules/virus2/effect.dm @@ -338,7 +338,7 @@ if(c_data) data = c_data else - data = pick("bicaridine", "kelotane", "anti_toxin", "inaprovaline", "ecstasy", "sugar", + data = pick("bicaridine", "kelotane", "anti_toxin", "inaprovaline", "bliss", "sugar", "tramadol", "dexalin", "cryptobiolin", "impedrezene", "hyperzine", "ethylredoxrazine", "mindbreaker", "glucose") var/datum/reagent/R = SSchemistry.chemical_reagents[data] diff --git a/code/modules/xenobio2/_xeno_setup.dm b/code/modules/xenobio2/_xeno_setup.dm index fc075e6248..9243a034a6 100644 --- a/code/modules/xenobio2/_xeno_setup.dm +++ b/code/modules/xenobio2/_xeno_setup.dm @@ -53,7 +53,7 @@ var/global/list/xenoChemList = list("mutationtoxin", "mindbreaker", "impedrezene", "cryptobiolin", - "ecstasy", + "bliss", "chloralhydrate", "stoxin", "mutagen",