cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Secondary goals (#24599)

Browse Source 
* Extract requests console message sending code.

* Add secondary goals

* Converted supply shuttle to a signal-based system.

* Lint.

* Review suggestions.

* Secondary goals can now check the supply shuttle for their requirements.

* Remove redundant completion variable, undef what we define.

* Made the request console refuse to issue a secondary goal until you finish the current one.

* Made the shuttle blacklist error more specific, added locked/manifest-attached crates to blacklist.

* Added round end secondary goal report.

* Lint

* Add tags to reagents for secondary goals to use.

* Extracted the reagent logic from the bar goal, used reagent tags.

* Added the Variety of Drinks Bar goal.

* Added variety drinks goal for the Bar.

* CC no longer complains about sending stuff in containers, but the shuttle will refuse lockboxes without goal items.

* Allow unlocked lockboxes on the shuttle.

* Added kitchen goals.

* Lint

* More lint

* Add goals for scichem and medchem, pending reagent labelling.

* Added Kudzu goal for botany.

* I forgot to rename them, oops.

* Lint

* Made mechs sellable, configurable goal rewards.

* Balancing changes.

* Added random Ripley goal.

* Add Clear Task Backlog station goal.

* Lint

* Oops.

* did i even do this right

* Lint

* Excluded drinks available from upgraded booze dispenser.

* Such bugs. Much fix. Wow.

* Goal notice formatting.

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Made storage nesting better, improved consistency between storage types.

* Out, er, space.

* Added a proc for sending a requests console message.

* Added error messages to Virology Goals.

Backported a few small things from Secondary Goals to make this easier.

* Extracted out the three-way reward code into a proc.

* Update code/__DEFINES/dcs/signals.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Removed redundant SIGNAL_HANDLER labels.

* Yes, that should be a proc.

* Enforce important parent calls.

* Thank you, DreamChecker

* Undid accidental merge of #24699

* Removed a testing proc that wasn't intended for this PR.

* Removed parts of #24750 that also crept in.

* Made the variety of [x] goals more explicit that they want 50u of each.

* Reduced Kudzu trait requirement to 1.

* Request consoles now output the list of valid departments if you're at an unsupported one.

* Added personal crates.

* Added a supply pack of personal crates.

* Added special cargo handling for personal crates.

* Added automatic personal crate when requesting a goal.

* Required personal crates for most secondary goals.

* Add goal labels to the hand labeler, require them for mech goals.

* Made secondary goals one-per-person, not one-per-department.

* Added support for multi-line system messages to the request consoles.

* Made the RC message for goals nicer.

* Send goal crates even if no normal crates are ready, name and access-lock them properly.

* Don't double-label.

* Let's not use registered_account, names are fine.

* Add a ton of blackbox data to cargo and secondary goals.

* Fix a few bugs.

* More bugfixing, couple more stats.

* Even more stats.

* Text fix.

* Made cargo fines more consistent with other cargo feedback.

* Fixed a bug that prevented non-top-level items from being checked for CARGO_REQUIRE_PRIORITY.

* Blocked large crates from being sent back unopened.

* Enum values should probably be different from each other.

* Correct a bitflag mishap.

* Removed redundant supply shuttle docking and buy/sell attempts.

* Tweak message about personal crates to inlclude that they need to lock it.

* Add /Crates to the Personal Lockers description.

* Less pretty alignment, less complaining linters.

* Corrected a bad name in stats tracking.

* Reduced SciChem variety goal to 5 types.

* Toned down Task Backlog a bit.

* Fixed a bug that made unsellable items nested in containers be stolen by CC (qdeleted).

* Don't require bluespace 8, that's silly.

* Made secondary goals modifiable in the Modify Station Goals UI.

* Whoops, that was supposed to be 600u.

* i ded pls nerf

---------

Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Charlie Nolan
2024-04-01 07:50:07 +00:00
committed by GitHub
co-authored by Henri215 DGamerL synthtee
parent 663e007d4d
commit 5c5f7842df
64 changed files with 2892 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/alcohol.dm
+83
View File
@@ -9,6 +9,7 @@
var/dizzy_adj = 6 SECONDS
var/alcohol_perc = 1 //percentage of ethanol in a beverage 0.0 - 1.0
taste_description = "liquid fire"
goal_department = "Bar"
/datum/reagent/consumable/ethanol/on_mob_life(mob/living/M)
M.AdjustDrunk(alcohol_perc STATUS_EFFECT_CONSTANT)
@@ -125,6 +126,7 @@
drink_name = "Hooch"
drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
taste_description = "pure resignation"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/hooch/on_mob_life(mob/living/carbon/M)
if(M.mind && M.mind.assigned_role == "Assistant")
@@ -161,6 +163,7 @@
drink_name = "Glass of Mojito"
drink_desc = "Fresh from Spesscuba."
taste_description = "mojito"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/vodka
name = "Vodka"
@@ -242,6 +245,7 @@
drink_name = "Suicider"
drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
taste_description = "approaching death"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/ale
name = "Ale"
@@ -291,6 +295,7 @@
drink_name = "Glass of bilk"
drink_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
taste_description = "bilk"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/atomicbomb
name = "Atomic Bomb"
@@ -303,6 +308,7 @@
drink_name = "Atomic Bomb"
drink_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
taste_description = "a long, fiery burn"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/ethanol/threemileisland
name = "Three Mile Island Iced Tea"
@@ -315,6 +321,7 @@
drink_name = "Three Mile Island Ice Tea"
drink_desc = "A glass of this is sure to prevent a meltdown."
taste_description = "a creeping heat"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/ethanol/goldschlager
name = "Goldschlager"
@@ -351,6 +358,7 @@
drink_name = "Gin and Tonic"
drink_desc = "A mild but still great cocktail. Drink up, like a true Englishman."
taste_description = "bitter medicine"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/cuba_libre
name = "Cuba Libre"
@@ -363,6 +371,7 @@
drink_name = "Cuba Libre"
drink_desc = "A classic mix of rum and cola."
taste_description = "liberation"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/whiskey_cola
name = "Whiskey Cola"
@@ -375,6 +384,7 @@
drink_name = "Whiskey Cola"
drink_desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
taste_description = "whiskey and coke"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/daiquiri
name = "Daiquiri"
@@ -387,6 +397,7 @@
drink_name = "Daiquiri"
drink_desc = "When Botany gives you limes, make daiquiris."
taste_description = "sweetened lime juice and rum"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/martini
name = "Classic Martini"
@@ -399,6 +410,7 @@
drink_name = "Classic Martini"
drink_desc = "Damn, the bartender even stirred it, not shook it."
taste_description = "class"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/vodkamartini
name = "Vodka Martini"
@@ -411,6 +423,7 @@
drink_name = "Vodka martini"
drink_desc ="A bastardisation of the classic martini. Still great."
taste_description = "class and potatoes"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/white_russian
name = "White Russian"
@@ -423,6 +436,7 @@
drink_name = "White Russian"
drink_desc = "A very nice looking drink. But that's just, like, your opinion, man."
taste_description = "very creamy alcohol"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/screwdrivercocktail
name = "Screwdriver"
@@ -435,6 +449,7 @@
drink_name = "Screwdriver"
drink_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
taste_description = "a naughty secret"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/booger
name = "Booger"
@@ -447,6 +462,7 @@
drink_name = "Booger"
drink_desc = "Eww..."
taste_description = "a fruity mess"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/bloody_mary
name = "Bloody Mary"
@@ -459,6 +475,7 @@
drink_name = "Bloody Mary"
drink_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
taste_description = "tomatoes with booze"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/gargle_blaster
name = "Pan-Galactic Gargle Blaster"
@@ -471,6 +488,7 @@
drink_name = "Pan-Galactic Gargle Blaster"
drink_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy."
taste_description = "the number fourty two"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/flaming_homer
name = "Flaming Moe"
@@ -483,6 +501,7 @@
drink_name = "Flaming Moe"
drink_desc = "Happiness is just a Flaming Moe away!"
taste_description = "caramelised booze and sweet, salty medicine"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/brave_bull
name = "Brave Bull"
@@ -507,6 +526,7 @@
drink_name = "Tequila Sunrise"
drink_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
taste_description = "fruity alcohol"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/toxins_special
name = "Toxins Special"
@@ -519,6 +539,7 @@
drink_name = "Toxins Special"
drink_desc = "Whoah, this thing is on FIRE"
taste_description = "FIRE"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/M)
if(M.bodytemperature < 330)
@@ -536,6 +557,7 @@
drink_name = "Beepsky Smash"
drink_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
taste_description = "THE LAW"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/irish_cream
name = "Irish Cream"
@@ -560,6 +582,7 @@
drink_name = "The Manly Dorf"
drink_desc = "A manly concotion made from Ale and Beer. Intended for true men only."
taste_description = "manliness"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/longislandicedtea
name = "Long Island Iced Tea"
@@ -572,6 +595,7 @@
drink_name = "Long Island Iced Tea"
drink_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
taste_description = "fruity alcohol"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/moonshine
name = "Moonshine"
@@ -584,6 +608,7 @@
drink_name = "Moonshine"
drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
taste_description = "prohibition"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/b52
name = "B-52"
@@ -596,6 +621,7 @@
drink_name = "B-52"
drink_desc = "Kahlua, Irish Cream, and congac. You will get bombed."
taste_description = "destruction"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/irishcoffee
name = "Irish Coffee"
@@ -608,6 +634,7 @@
drink_name = "Irish Coffee"
drink_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
taste_description = "coffee and booze"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/margarita
name = "Margarita"
@@ -620,6 +647,7 @@
drink_name = "Margarita"
drink_desc = "On the rocks with salt on the rim. Arriba~!"
taste_description = "daisies"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/black_russian
name = "Black Russian"
@@ -632,6 +660,7 @@
drink_name = "Black Russian"
drink_desc = "For the lactose-intolerant. Still as classy as a White Russian."
taste_description = "sweet alcohol"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/manhattan
name = "Manhattan"
@@ -656,6 +685,7 @@
drink_name = "Manhattan Project"
drink_desc = "A scientist's drink of choice, for thinking how to blow up the station."
taste_description = "the apocalypse"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/ethanol/whiskeysoda
name = "Whiskey Soda"
@@ -668,6 +698,7 @@
drink_name = "Whiskey Soda"
drink_desc = "Ultimate refreshment."
taste_description = "mediocrity"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/antifreeze
name = "Anti-freeze"
@@ -680,6 +711,7 @@
drink_name = "Anti-freeze"
drink_desc = "The ultimate refreshment."
taste_description = "poor life choices"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/M)
if(M.bodytemperature < 330)
@@ -698,6 +730,7 @@
drink_name = "Admin Freeze"
drink_desc = "The ultimate punishment."
taste_description = "a series of bad decisions"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/ethanol/adminfreeze/reaction_mob(mob/living/M, method = REAGENT_INGEST, volume)
..()
@@ -716,6 +749,7 @@
drink_name = "Barefoot"
drink_desc = "Barefoot and pregnant"
taste_description = "pregnancy"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/snowwhite
name = "Snow White"
@@ -728,6 +762,7 @@
drink_name = "Snow White"
drink_desc = "A cold refreshment."
taste_description = "a poisoned apple"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/demonsblood
name = "Demons Blood"
@@ -741,6 +776,7 @@
drink_name = "Demons Blood"
drink_desc = "Just looking at this thing makes the hair at the back of your neck stand up."
taste_description = "<span class='warning'>evil</span>"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/vodkatonic
name = "Vodka and Tonic"
@@ -754,6 +790,7 @@
drink_name = "Vodka and Tonic"
drink_desc = "For when a gin and tonic isn't russian enough."
taste_description = "bitter medicine"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/ginfizz
name = "Gin Fizz"
@@ -767,6 +804,7 @@
drink_name = "Gin Fizz"
drink_desc = "Refreshingly lemony, deliciously dry."
taste_description = "fizzy alcohol"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/bahama_mama
name = "Bahama mama"
@@ -779,6 +817,7 @@
drink_name = "Bahama Mama"
drink_desc = "Tropic cocktail"
taste_description = "HONK"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/singulo
name = "Singulo"
@@ -792,6 +831,7 @@
drink_name = "Singulo"
drink_desc = "A bluespace beverage."
taste_description = "infinity"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/sbiten
name = "Sbiten"
@@ -804,6 +844,7 @@
drink_name = "Sbiten"
drink_desc = "A spicy mix of Vodka and Spice. Very hot."
taste_description = "comforting warmth"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/M)
if(M.bodytemperature < 360)
@@ -821,6 +862,7 @@
drink_name = "Devils Kiss"
drink_desc = "Creepy time!"
taste_description = "naughtiness"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/red_mead
name = "Red Mead"
@@ -833,6 +875,7 @@
drink_name = "Red Mead"
drink_desc = "A True Vikings Beverage, though its color is strange."
taste_description = "blood"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/ethanol/mead
name = "Mead"
@@ -875,6 +918,7 @@
drink_name = "Grog"
drink_desc = "A fine and cepa drink for Space."
taste_description = "strongly diluted rum"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/aloe
name = "Aloe"
@@ -887,6 +931,7 @@
drink_name = "Aloe"
drink_desc = "Very, very, very good."
taste_description = "healthy skin"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/andalusia
name = "Andalusia"
@@ -899,6 +944,7 @@
drink_name = "Andalusia"
drink_desc = "A nice, strange named drink."
taste_description = "sweet alcohol"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/alliescocktail
name = "Allies Cocktail"
@@ -911,6 +957,7 @@
drink_name = "Allies cocktail"
drink_desc = "A drink made from your allies."
taste_description = "victory"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/acid_spit
name = "Acid Spit"
@@ -923,6 +970,7 @@
drink_name = "Acid Spit"
drink_desc = "A drink from Nanotrasen. Made from live aliens."
taste_description = "PAIN"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/amasec
name = "Amasec"
@@ -935,6 +983,7 @@
drink_name = "Amasec"
drink_desc = "Always handy before COMBAT!!!"
taste_description = "a stunbaton"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/neurotoxin
name = "Neuro-toxin"
@@ -949,6 +998,7 @@
drink_name = "Neurotoxin"
drink_desc = "A drink that is guaranteed to knock you silly."
taste_description = "brain damageeeEEeee"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -971,6 +1021,7 @@
drink_name = "Hippie's Delight"
drink_desc = "A drink enjoyed by people during the 1960's."
taste_description = "colors"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1009,6 +1060,7 @@
drink_name = "Changeling Sting"
drink_desc = "A stingy drink."
taste_description = "a tiny prick"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/dublindrop
name = "Dublin Drop"
@@ -1022,6 +1074,7 @@
drink_name = "Dublin Drop"
drink_desc = "A Dublin drop. Pub legends say one of the ingredients can bring back the dead."
taste_description = "a belt in the gob"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/syndicatebomb
name = "Syndicate Bomb"
@@ -1034,6 +1087,7 @@
drink_name = "Syndicate Bomb"
drink_desc = "A syndicate bomb."
taste_description = "a job offer"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/erikasurprise
name = "Erika Surprise"
@@ -1046,6 +1100,7 @@
drink_name = "Erika Surprise"
drink_desc = "The surprise is, it's green!"
taste_description = "disappointment"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/driestmartini
name = "Driest Martini"
@@ -1059,6 +1114,7 @@
drink_name = "Driest Martini"
drink_desc = "Only for the experienced. You think you see sand floating in the glass."
taste_description = "dust and ashes"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/driestmartini/on_mob_life(mob/living/M)
if(current_cycle >= 55 && current_cycle < 115)
@@ -1093,6 +1149,7 @@
drink_name = "Gin and Sonic"
drink_desc = "An extremely high amperage drink. Absolutely not for the true Englishman."
taste_description = "SPEED"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/ginsonic/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1121,6 +1178,7 @@
drink_name = "Glass of applejack"
drink_desc = "When cider isn't strong enough, you gotta jack it."
taste_description = "strong cider"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/jackrose
name = "Jack Rose"
@@ -1132,6 +1190,7 @@
drink_name = "Jack Rose"
drink_desc = "Drinking this makes you feel like you belong in a luxury hotel bar during the 1920s."
taste_description = "style"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/drunkenblumpkin
name = "Drunken Blumpkin"
@@ -1143,6 +1202,7 @@
drink_name = "Drunken Blumpkin"
drink_desc = "A drink for the drunks"
taste_description = "weirdness"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/eggnog
name = "Eggnog"
@@ -1155,6 +1215,7 @@
drink_name = "Eggnog"
drink_desc = "For enjoying the most wonderful time of the year."
taste_description = "christmas spirit"
goal_difficulty = REAGENT_GOAL_HARD
/// inaccessible to players, but here for admin shennanigans
/datum/reagent/consumable/ethanol/dragons_breath
@@ -1256,6 +1317,7 @@
drink_name = "Glass of Trinary"
drink_desc = "Colorful drink made for synthetic crewmembers. It doesn't seem like it would taste well."
taste_description = "modem static"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/synthanol/servo
name = "Servo"
@@ -1268,6 +1330,7 @@
drink_name = "Glass of Servo"
drink_desc = "Chocolate - based drink made for IPCs. Not sure if anyone's actually tried out the recipe."
taste_description = "motor oil and cocoa"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/synthanol/uplink
name = "Uplink"
@@ -1280,6 +1343,7 @@
drink_name = "Glass of Uplink"
drink_desc = "An exquisite mix of the finest liquoirs and synthanol. Meant only for synthetics."
taste_description = "a GUI in visual basic"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/synthanol/synthnsoda
name = "Synth 'n Soda"
@@ -1292,6 +1356,7 @@
drink_name = "Glass of Synth 'n Soda"
drink_desc = "Classic drink altered to fit the tastes of a robot. Bad idea to drink if you're made of carbon."
taste_description = "fizzy motor oil"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/synthanol/synthignon
name = "Synthignon"
@@ -1464,6 +1529,7 @@
drink_desc = "A sawed-off cola bottle filled with Fernet Cola. You can hear cuarteto music coming from the inside."
taste_description = "low class heaven"
remove_nutrition = 1
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/gimlet
name = "Gimlet"
@@ -1475,6 +1541,7 @@
drink_name = "Gimlet"
drink_desc = "There are debates on whether this drink should be half gin and half lime, or three parts gin and one part lime. All you know is, it's alcohol."
taste_description = "sharpness"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/sidecar
name = "Sidecar"
@@ -1486,6 +1553,7 @@
drink_name = "Sidecar"
drink_desc = "You can smell the citrus from here!"
taste_description = "smooth cognac and tart citrus"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/ethanol/whiskey_sour
name = "Whiskey Sour"
@@ -1497,6 +1565,7 @@
drink_name = "Whiskey Sour"
drink_desc = "Lemon and whiskey, with a cute foamy head!"
taste_description = "warm whiskey and sweetness"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/ethanol/mint_julep
name = "Mint Julep"
@@ -1508,6 +1577,7 @@
drink_name = "Mint Julep"
drink_desc = "A dainty glass of whiskey and mint on the rocks. Perfect for summer!"
taste_description = "sweet and cooling mint"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/pina_colada
name = "Pina Colada"
@@ -1519,6 +1589,7 @@
drink_name = "Pina Colada"
drink_desc = "After taking a sip, you feel contractually obligated to start singing a certain song of the same name."
taste_description = "tart and tropical pineapple"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/bilkshake
name = "Bilkshake"
@@ -1531,6 +1602,7 @@
drink_name = "Bilkshake"
drink_desc = "Your mind bubbles and oozes as it tries to comprehend what it's seeing. What the HELL is this?"
taste_description = "bilk, cream, and cold tears"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/sontse
name = "Sontse"
@@ -1543,6 +1615,7 @@
drink_desc = "The Sun, The Sun, The Sun, The Sun, The Sun, THE SUN!"
taste_description = "warmth and brightness"
var/light_activated = FALSE
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/ethanol/sontse/on_mob_life(mob/living/M)
if(current_cycle != 5 || !ismoth(M))
@@ -1571,6 +1644,7 @@
drink_desc = "Blizzard in a glass. Tajaran signature drink!"
taste_description = "ice"
var/min_achievable_temp = 250
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/ahdomai_eclipse/on_mob_life(mob/living/M)
. = ..()
@@ -1587,6 +1661,7 @@
drink_name = "Feast by the Beach"
drink_desc = "A classic Unathi drink. You can spot sand sediment at the bottom of the glass. The drink is hot as hell and more."
taste_description = "sand"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/beach_feast/on_mob_life(mob/living/M)
if(!isunathi(M))
@@ -1605,6 +1680,7 @@
drink_name = "Jungle Vox"
drink_desc = "Classy drink in a glass vox head with a bit of liquid nitrogen added on."
taste_description = "bubbles"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/jungle_vox/on_mob_life(mob/living/M)
if(current_cycle <= 5 || !isvox(M))
@@ -1624,6 +1700,7 @@
drink_name = "Slime Mold"
drink_desc = "You can swear that this jelly looks alive."
taste_description = "jelly"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/ethanol/slime_mold/on_mob_life(mob/living/M)
if(!isslimeperson(M))
@@ -1644,6 +1721,7 @@
drink_name = "Die Seife"
drink_desc = "There is a piece of soap at the bottom of the glass and it is slowly melting."
taste_description = "soap"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/die_seife/on_mob_life(mob/living/M)
if(current_cycle % 10 != 0 || !isdrask(M))
@@ -1664,6 +1742,7 @@
drink_name = "Acid Dreams"
drink_desc = "This one looks just weird and reeks of acid."
taste_description = "acid"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/acid_dreams/on_mob_life(mob/living/M)
if(current_cycle % 10 != 0 || !isgrey(M))
@@ -1689,6 +1768,7 @@
drink_name = "Islay Whiskey"
drink_desc = "Named in honor of one of the most gritty and earth smelling types of Whiskey of Earth, this drink is a treat for any Diona."
taste_description = "soil"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/islay_whiskey/on_mob_life(mob/living/M)
if(current_cycle <=5 || !isdiona(M))
@@ -1715,6 +1795,7 @@
drink_desc = "In the triangle of fire, this is apex of fuel."
taste_description = "fire"
var/on_fire = FALSE
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/ethanol/ultramatter/on_mob_life(mob/living/M)
// species agnostic as it is DRINKS on_fire, so only plasmaman can get it
@@ -1747,6 +1828,7 @@
drink_name = "Howler"
drink_desc = "Old classic human drink that was adopted by Vulpkanin."
taste_description = "citrus"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/consumable/ethanol/howler/on_mob_life(mob/living/M)
if(!isvulpkanin(M))
@@ -1769,6 +1851,7 @@
drink_desc = "Fake Diona is floating carelessly in the middle of this drink."
taste_description = "the crunch"
var/mutated = FALSE
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ethanol/diona_smash/on_mob_life(mob/living/M)
if(mutated || !iskidan(M))
code/modules/reagents/chemistry/reagents/drugs.dm
+30
View File
@@ -28,6 +28,8 @@
reagent_state = LIQUID
color = "#0000D8"
taste_description = "a magical journey"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/lsd/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -46,6 +48,8 @@
addiction_threshold = 10
heart_rate_decrease = 1
taste_description = "a synthetic high"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/space_drugs/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -171,6 +175,8 @@
addiction_threshold = 5
addiction_decay_rate = 0.2 // half the metabolism rate
taste_description = "bitterness"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/crank/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -249,6 +255,8 @@
overdose_threshold = 20
addiction_chance = 10
addiction_threshold = 5
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/pump_up/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -290,6 +298,8 @@
addiction_threshold = 10
taste_description = "very poor life choices"
allowed_overdose_process = TRUE
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/krokodil/on_mob_life(mob/living/M)
@@ -370,6 +380,8 @@
allowed_overdose_process = TRUE //Requested by balance.
/// modifier to the stun time of the mob taking the drug
var/tenacity = 1.5
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/methamphetamine/on_mob_add(mob/living/L)
ADD_TRAIT(L, TRAIT_GOTTAGOFAST, id)
@@ -440,6 +452,8 @@
addiction_decay_rate = 0.2
taste_description = "WAAAAGH"
var/bonus_damage = 2
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/bath_salts/on_mob_add(mob/living/L)
if(ishuman(L))
@@ -541,6 +555,8 @@
addiction_chance = 5
addiction_threshold = 5
taste_description = "the inside of a toilet... or worse"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/jenkem/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -563,6 +579,8 @@
addiction_decay_rate = 0.2
/// how much do we edit the stun and stamina mods? lower is more resistance
var/tenacity = 0.5
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/aranesp/on_mob_add(mob/living/L)
if(ishuman(L))
@@ -610,6 +628,8 @@
addiction_chance_additional = 20
addiction_threshold = 20
minor_addiction = TRUE
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/happiness/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -718,6 +738,8 @@
addiction_chance_additional = 20
addiction_threshold = 10
taste_description = "flips"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/fliptonium/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -784,6 +806,8 @@
color = "#AC88CA" //RGB: 172, 136, 202
metabolization_rate = 0.6 * REAGENTS_METABOLISM
taste_description = "spinning"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/rotatium/on_mob_life(mob/living/carbon/M)
if(M.hud_used)
@@ -834,6 +858,8 @@
var/constant_dose_time = 0
/// Keeps track of how many chemicals we are delaying the changeling by.
var/changeling_chemical_tracker = 0
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/mephedrone/on_mob_add(mob/living/carbon/L)
@@ -1121,6 +1147,8 @@
addiction_decay_rate = 0.1 //very low to force them to take time off of meth
taste_description = "wiper fluid"
var/tenacity = 1.5 // higher is worse
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/lube/ultra/on_mob_add(mob/living/L)
ADD_TRAIT(L, TRAIT_GOTTAGOFAST, id)
@@ -1184,6 +1212,8 @@
addiction_threshold = 5
addiction_decay_rate = 0.2
taste_description = "silicon"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/surge/on_mob_life(mob/living/M)
code/modules/reagents/chemistry/reagents/food_reagents.dm
+14
View File
@@ -133,6 +133,8 @@
nutriment_factor = 2 * REAGENTS_METABOLISM
color = "#792300" // rgb: 121, 35, 0
taste_description = "soy"
goal_department = "Kitchen"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/ketchup
name = "Ketchup"
@@ -150,6 +152,8 @@
reagent_state = LIQUID
color = "#DFDFDF" // rgb: 223, 223, 223
taste_description = "mayonnaise"
goal_department = "Kitchen"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/peanutbutter
name = "Peanut Butter"
@@ -169,6 +173,8 @@
color = "#78280A" // rbg: 120, 40, 10
taste_mult = 2.5
taste_description = "smokey sweetness"
goal_department = "Kitchen"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/capsaicin
name = "Capsaicin Oil"
@@ -372,6 +378,8 @@
nutriment_factor = 10 * REAGENTS_METABOLISM
color = "#DBCF5C" //rgb: 219, 207, 92
taste_description = "olive oil"
goal_department = "Kitchen"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/cornoil/reaction_turf(turf/simulated/T, volume)
if(!istype(T))
@@ -393,6 +401,8 @@
reagent_state = LIQUID
color = "#282314" // rgb: 54, 94, 48
taste_description = "sweetness"
goal_department = "Kitchen"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/consumable/dry_ramen
name = "Dry Ramen"
@@ -778,6 +788,8 @@
reagent_state = LIQUID
color = "#B4641B"
taste_description = "gravy"
goal_department = "Kitchen"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/consumable/wasabi
name = "Wasabi"
@@ -1014,3 +1026,5 @@
description = "Useful for pickling, or putting on chips."
taste_description = "vinegar"
color = "#ffffff"
goal_department = "Kitchen"
goal_difficulty = REAGENT_GOAL_NORMAL
code/modules/reagents/chemistry/reagents/medicine.dm
+35
View File
@@ -3,6 +3,7 @@
id = "medicine"
taste_description = "bitterness"
harmless = TRUE
goal_department = "Medbay"
/datum/reagent/medicine/on_mob_life(mob/living/M)
current_cycle++
@@ -22,6 +23,7 @@
metabolization_rate = 0.3 // Lasts 1.5 minutes for 15 units
shock_reduction = 200
taste_description = "numbness"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/hydrocodone/on_mob_life(mob/living/M) //Needed so the hud updates when injested / removed from system
var/update_flags = STATUS_UPDATE_HEALTH
@@ -34,6 +36,7 @@
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
taste_description = "antiseptic"
goal_difficulty = REAGENT_GOAL_EASY
//makes you squeaky clean
/datum/reagent/medicine/sterilizine/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
@@ -97,6 +100,7 @@
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
taste_description = "nurturing"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/mitocholide/on_mob_life(mob/living/M)
if(ishuman(M))
@@ -124,6 +128,7 @@
color = "#0000C8" // rgb: 200, 165, 220
heart_rate_decrease = 1
taste_description = "a safe refuge"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/cryoxadone/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume, show_message = TRUE)
if(iscarbon(M))
@@ -161,6 +166,7 @@
overdose_threshold = 30
harmless = FALSE
taste_description = "reformation"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/rezadone/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -190,6 +196,7 @@
color = "#0AB478"
metabolization_rate = 0.2
taste_description = "antibiotics"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/medicine/spaceacillin/on_mob_life(mob/living/M)
var/list/organs_list = list()
@@ -223,6 +230,7 @@
penetrates_skin = TRUE
metabolization_rate = 0.15
taste_description = "salt"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -286,6 +294,7 @@
color = "#FFEBEB"
penetrates_skin = TRUE
taste_description = "blood"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/heal_on_apply/synthflesh/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume, show_message = 1)
var/mob/living/carbon/human/H = M
@@ -320,6 +329,7 @@
metabolization_rate = 3
harmless = FALSE
taste_description = "wound cream"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/medicine/heal_on_apply/styptic_powder/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -353,6 +363,7 @@
metabolization_rate = 3
harmless = FALSE //toxic if ingested, and I am NOT going to account for the difference
taste_description = "burn cream"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/medicine/heal_on_apply/silver_sulfadiazine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -383,6 +394,7 @@
reagent_state = LIQUID
color = "#000000"
taste_description = "dust"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/medicine/charcoal/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -464,6 +476,7 @@
metabolization_rate = 0.8
harmless = FALSE
taste_description = "a painful cleansing"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/medicine/calomel/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -483,6 +496,7 @@
reagent_state = LIQUID
color = "#B4DCBE"
taste_description = "cleansing"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M)
M.radiation = max(0, M.radiation - 25)
@@ -496,6 +510,7 @@
color = "#C8A5DC"
harmless = FALSE
taste_description = "a purge"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -521,6 +536,7 @@
overdose_threshold = 25
harmless = FALSE
taste_description = "relief"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -555,6 +571,7 @@
color = "#00FFFF"
metabolization_rate = 0.2
taste_description = "safety"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -576,6 +593,7 @@
addiction_threshold = 10
harmless = FALSE
taste_description = "oxygenation"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/perfluorodecalin/on_mob_life(mob/living/carbon/human/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -601,6 +619,7 @@
overdose_threshold = 35
harmless = FALSE
taste_description = "stimulation"
goal_difficulty = REAGENT_GOAL_HARD
//super weak antistun chem, barely any downside
/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/M)
@@ -656,6 +675,7 @@
overdose_threshold = 35
harmless = FALSE
taste_description = "antihistamine"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/M)
M.AdjustJitter(-40 SECONDS)
@@ -743,6 +763,7 @@
reagent_state = LIQUID
color = "#C8A5DC"
taste_description = "clarity"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -775,6 +796,7 @@
overdose_threshold = 25
harmless = FALSE
taste_description = "a moment of respite"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/medicine/atropine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -804,6 +826,7 @@
overdose_threshold = 20
harmless = FALSE
taste_description = "borrowed time"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -856,6 +879,7 @@
taste_description = "life"
harmless = FALSE
var/revive_type = SENTIENCE_ORGANIC //So you can't revive boss monsters or robots with it
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/medicine/lazarus_reagent/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -926,6 +950,7 @@
taste_description = "coppery fuel"
harmless = FALSE
overdose_threshold = 15
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/medicine/sanguine_reagent/on_mob_life(mob/living/M)
if(!ishuman(M))
@@ -981,6 +1006,7 @@
taste_description = "chunky marrow"
harmless = FALSE
overdose_threshold = 30 //so a single shotgun dart can't cause the tumor effect
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/medicine/osseous_reagent/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1004,6 +1030,7 @@
description = "Mannitol is a sugar alcohol that can help alleviate cranial swelling."
color = "#D1D1F1"
taste_description = "sweetness"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1016,6 +1043,7 @@
description = "Mutadone is an experimental bromide that can cure genetic abnomalities."
color = "#5096C8"
taste_description = "cleanliness"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/human/M)
if(M.mind && M.mind.assigned_role == "Cluwne") // HUNKE
@@ -1045,6 +1073,7 @@
description = "A medicine which quickly eliminates alcohol in the body."
color = "#009CA8"
taste_description = "sobriety"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/medicine/antihol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1160,6 +1189,7 @@
color = "#eee6da"
overdose_threshold = 20
taste_description = "bitterness"
goal_difficulty = REAGENT_GOAL_HARD
/datum/reagent/heparin/on_mob_life(mob/living/M)
M.reagents.remove_reagent("cholesterol", 2)
@@ -1200,6 +1230,7 @@
addiction_threshold = 10
overdose_threshold = 50
taste_description = "warmth and stability"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/teporone/on_mob_life(mob/living/M)
if(M.bodytemperature > 310)
@@ -1217,6 +1248,7 @@
taste_description = "stability"
harmless = FALSE
var/list/drug_list = list("crank", "methamphetamine", "space_drugs", "synaptizine", "psilocybin", "ephedrine", "epinephrine", "stimulants", "stimulative_agent", "bath_salts", "lsd", "thc", "mephedrone")
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1246,6 +1278,7 @@
metabolization_rate = 0.1
harmless = FALSE
taste_description = "sleepiness"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/medicine/ether/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1326,6 +1359,7 @@
color = "#CC7A00"
process_flags = SYNTHETIC
taste_description = "overclocking"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/medicine/degreaser/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1354,6 +1388,7 @@
color = "#D7B395"
process_flags = SYNTHETIC
taste_description = "heavy metals"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/medicine/liquid_solder/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
code/modules/reagents/chemistry/reagents/toxins.dm
+20
View File
@@ -182,6 +182,8 @@
metabolization_rate = 0.3
taste_mult = 0.9
taste_description = "slime"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/mutagen/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
if(!M || !M.dna || HAS_TRAIT(M, TRAIT_BADDNA) || HAS_TRAIT(M, TRAIT_GENELESS))
@@ -279,6 +281,8 @@
process_flags = ORGANIC | SYNTHETIC
taste_description = "<span class='userdanger'>ACID</span>"
var/acidpwr = 10 //the amount of protection removed from the armour
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/acid/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -336,6 +340,8 @@
description = "Fluorosulfuric acid is a an extremely corrosive super-acid."
color = "#5050FF"
acidpwr = 42
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/acid/facid/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -389,6 +395,8 @@
color = "#0080ff"
reagent_state = LIQUID
taste_description = "vinegar"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/acetic_acid/reaction_mob(mob/living/carbon/human/H, method = REAGENT_TOUCH, volume)
if(method != REAGENT_TOUCH)
@@ -588,6 +596,8 @@
color = "#B44B00"
penetrates_skin = TRUE
taste_description = "bitterness"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/formaldehyde/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -604,6 +614,8 @@
color = "#B44B00"
penetrates_skin = TRUE
taste_description = "apples"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/acetaldehyde/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -645,6 +657,8 @@
color = "#60A584"
metabolization_rate = 1
taste_mult = 0
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_EASY
/datum/reagent/neurotoxin2/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -685,6 +699,8 @@
metabolization_rate = 0.1
penetrates_skin = TRUE
taste_description = "almonds"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/cyanide/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -710,6 +726,8 @@
metabolization_rate = 0.3
penetrates_skin = TRUE
taste_description = "prickliness"
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/itching_powder/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_STAT
@@ -1083,6 +1101,8 @@
reagent_state = LIQUID
color = "#773E73" //RGB: 47 24 45
lethality = 2 //Atrazine, however, is definitely toxic
goal_department = "Science"
goal_difficulty = REAGENT_GOAL_EASY
/// To-Do; make this more realistic.
code/modules/reagents/chemistry/reagents_datum.dm
+7
View File
@@ -38,6 +38,13 @@
/// how quickly the addiction threshold var decays
var/addiction_decay_rate = 0.01
// Which department's (if any) reagent goals this is eligible for.
// Must match the values used by request consoles.
var/goal_department = "Unknown"
// How difficult is this chemical for the department to make?
// Affects the quantity of the reagent that is requested by CC.
var/goal_difficulty = REAGENT_GOAL_SKIP
/datum/reagent/Destroy()
. = ..()
holder = null