cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] moves can_synth to chemical_flags (#3370)

Browse Source 
* moves can_synth to chemical_flags

* a

Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-15 15:56:37 +01:00
committed by GitHub
parent 94e75ebc6c
commit 2a9ee9628f
18 changed files with 556 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/reagents.dm
View File

@@ -66,6 +66,8 @@
#define REAGENT_SNEAKYNAME (1<<3)
///Retains initial volume of chem when splitting for purity effects
#define REAGENT_SPLITRETAINVOL (1<<4)
//Lets a given reagent be synthesized important for random reagents and things like the odysseus syringe gun(Replaces the old can_synth variable)
#define REAGENT_CAN_BE_SYNTHESIZED (1<<5)
//Chemical reaction flags, for determining reaction specialties
///Convert into impure/pure on reaction completion

1
code/_globalvars/bitfields.dm
View File

@@ -301,6 +301,7 @@ DEFINE_BITFIELD(chemical_flags, list(
"REAGENT_INVISIBLE" = REAGENT_INVISIBLE,
"REAGENT_SNEAKYNAME" = REAGENT_SNEAKYNAME,
"REAGENT_SPLITRETAINVOL" = REAGENT_SPLITRETAINVOL,
"REAGENT_CAN_BE_SYNTHESIZED" = REAGENT_CAN_BE_SYNTHESIZED,
))
DEFINE_BITFIELD(reaction_flags, list(

2
code/modules/antagonists/blob/blobstrains/_reagent.dm
View File

@@ -24,7 +24,7 @@
description = "shouldn't exist and you should adminhelp immediately."
color = "#FFFFFF"
taste_description = "bad code and slime"
can_synth = FALSE
chemical_flags = NONE
penetrates_skin = NONE
/// Used by blob reagents to calculate the reaction volume they should use when exposing mobs.

8
code/modules/reagents/chemistry/holder.dm
View File

@@ -378,7 +378,7 @@
* * preserve_data - if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred.
* * no_react - passed through to [/datum/reagents/proc/add_reagent]
* * mob/transfered_by - used for logging
* * remove_blacklisted - skips transferring of reagents with can_synth = FALSE
* * remove_blacklisted - skips transferring of reagents without REAGENT_CAN_BE_SYNTHESIZED in chemical_flags
* * methods - passed through to [/datum/reagents/proc/expose_single] and [/datum/reagent/proc/on_transfer]
* * show_message - passed through to [/datum/reagents/proc/expose_single]
* * round_robin - if round_robin=TRUE, so transfer 5 from 15 water, 15 sugar and 15 plasma becomes 10, 15, 15 instead of 13.3333, 13.3333 13.3333. Good if you hate floating point errors
@@ -423,7 +423,7 @@
var/part = amount / src.total_volume
for(var/reagent in cached_reagents)
var/datum/reagent/T = reagent
if(remove_blacklisted && !T.can_synth)
if(remove_blacklisted && !(T.chemical_flags & REAGENT_CAN_BE_SYNTHESIZED))
continue
var/transfer_amount = T.volume * part
if(preserve_data)
@@ -447,7 +447,7 @@
if(!to_transfer)
break
var/datum/reagent/T = reagent
if(remove_blacklisted && !T.can_synth)
if(remove_blacklisted && !(T.chemical_flags & REAGENT_CAN_BE_SYNTHESIZED))
continue
if(preserve_data)
trans_data = copy_data(T)
@@ -1497,7 +1497,7 @@
if(!random_reagents.len)
for(var/thing in subtypesof(/datum/reagent))
var/datum/reagent/R = thing
if(initial(R.can_synth))
if(initial(R.chemical_flags) & REAGENT_CAN_BE_SYNTHESIZED)
random_reagents += R
var/picked_reagent = pick(random_reagents)
return picked_reagent

4
code/modules/reagents/chemistry/reagents.dm
View File

@@ -52,8 +52,6 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
var/creation_purity = 1
/// color it looks in containers etc
var/color = "#000000" // rgb: 0, 0, 0
/// can this reagent be synthesized? (for example: odysseus syringe gun)
var/can_synth = TRUE
///how fast the reagent is metabolized by the mob
var/metabolization_rate = REAGENTS_METABOLISM
/// appears unused
@@ -82,7 +80,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
var/list/reagent_removal_skip_list = list()
///The set of exposure methods this penetrates skin with.
var/penetrates_skin = VAPOR
/// See fermi_readme.dm REAGENT_DEAD_PROCESS, REAGENT_DONOTSPLIT, REAGENT_INVISIBLE, REAGENT_SNEAKYNAME, REAGENT_SPLITRETAINVOL
/// See fermi_readme.dm REAGENT_DEAD_PROCESS, REAGENT_DONOTSPLIT, REAGENT_INVISIBLE, REAGENT_SNEAKYNAME, REAGENT_SPLITRETAINVOL, REAGENT_CANSYNTH
var/chemical_flags = NONE
///impure chem values (see fermi_readme.dm for more details on impure/inverse/failed mechanics):
/// What chemical path is made when metabolised as a function of purity

133
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
View File

@@ -91,6 +91,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of beer"
glass_desc = "A freezing pint of beer."
ph = 4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
// Beer is a chemical composition of alcohol and various other things. It's a garbage nutrient but hey, it's still one. Also alcohol is bad, mmmkay?
@@ -108,6 +109,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of light beer"
glass_desc = "A freezing pint of watery light beer."
ph = 5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/beer/maltliquor
name = "Malt Liquor"
@@ -117,6 +119,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of malt liquor"
glass_desc = "A freezing pint of malt liquor."
ph = 4.8
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/beer/green
name = "Green Beer"
@@ -127,6 +130,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of green beer"
glass_desc = "A freezing pint of green beer. Festive."
ph = 6
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/carbon/M)
@@ -147,6 +151,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "DAMN, THIS THING LOOKS ROBUST!"
shot_glass_icon_state = "shotglasscream"
ph = 6
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
@@ -168,6 +173,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
shot_glass_icon_state = "shotglassbrown"
ph = 4.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/whiskey/kong
name = "Kong"
@@ -177,6 +183,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
taste_description = "the grip of a giant ape"
glass_name = "glass of Kong"
glass_desc = "Makes You Go Ape!&#174;"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/whiskey/kong/addiction_act_stage1(mob/living/M)
if(prob(5))
@@ -213,6 +220,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of candy corn liquor"
glass_desc = "Good for your Imagination."
var/hal_amt = 4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/whiskey/candycorn/on_mob_life(mob/living/carbon/M)
if(prob(10))
@@ -232,6 +240,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "thirteen_loko_glass"
glass_name = "glass of Thirteen Loko"
glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-7)
@@ -293,6 +302,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "The glass contain wodka. Xynta."
shot_glass_icon_state = "shotglassclear"
ph = 8.1
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/carbon/M)
M.radiation = max(M.radiation-2,0)
@@ -308,6 +318,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "glass_brown"
glass_name = "glass of bilk"
glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() && prob(10))
@@ -326,6 +337,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Three Mile Island Ice Tea"
glass_desc = "A glass of this is sure to prevent a meltdown."
ph = 3.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/carbon/M)
M.set_drugginess(50)
@@ -341,6 +353,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of gin"
glass_desc = "A crystal clear glass of Griffeater gin."
ph = 6.9
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/rum
name = "Rum"
@@ -365,6 +378,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Now all that's missing is the weird colored shades!"
shot_glass_icon_state = "shotglassgold"
ph = 4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/vermouth
name = "Vermouth"
@@ -377,6 +391,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "You wonder why you're even drinking this straight."
shot_glass_icon_state = "shotglassclear"
ph = 3.25
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/wine
name = "Wine"
@@ -389,6 +404,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "A very classy looking drink."
shot_glass_icon_state = "shotglassred"
ph = 3.45
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/wine/on_merge(data)
. = ..()
@@ -411,6 +427,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
quality = DRINK_FANTASTIC
taste_description = "scaley sweetness"
ph = 3
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/grappa
name = "Grappa"
@@ -422,6 +439,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of grappa"
glass_desc = "A fine drink originally made to prevent waste by using the leftovers from winemaking."
ph = 3.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/amaretto
name = "Amaretto"
@@ -433,6 +451,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of amaretto"
glass_desc = "A sweet and syrupy looking drink."
shot_glass_icon_state = "shotglassgold"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/cognac
name = "Cognac"
@@ -445,6 +464,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this."
shot_glass_icon_state = "shotglassbrown"
ph = 3.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/absinthe
name = "Absinthe"
@@ -456,6 +476,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of absinthe"
glass_desc = "It's as strong as it smells."
shot_glass_icon_state = "shotglassgreen"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/M)
if(prob(10) && !HAS_TRAIT(M, TRAIT_ALCOHOL_TOLERANCE))
@@ -471,6 +492,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "glass_brown2"
glass_name = "Hooch"
glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/hooch/on_mob_life(mob/living/carbon/M)
var/obj/item/organ/liver/liver = M.getorganslot(ORGAN_SLOT_LIVER)
@@ -489,6 +511,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of ale"
glass_desc = "A freezing pint of delicious Ale."
ph = 4.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/goldschlager
name = "Goldschlager"
@@ -501,6 +524,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of goldschlager"
glass_desc = "100% proof that teen girls will drink anything with gold in it."
shot_glass_icon_state = "shotglassgold"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/// Ratio of gold that the goldschlager recipe contains
var/static/gold_ratio
@@ -551,6 +575,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Drinking patron in the bar, with all the subpar ladies."
shot_glass_icon_state = "shotglassclear"
ph = 4.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/gintonic
name = "Gin and Tonic"
@@ -563,6 +588,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Gin and Tonic"
glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman."
ph = 3
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/rum_coke
name = "Rum and Coke"
@@ -575,6 +601,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Rum and Coke"
glass_desc = "The classic go-to of space-fratboys."
ph = 4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/cuba_libre
name = "Cuba Libre"
@@ -586,6 +613,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "cubalibreglass"
glass_name = "Cuba Libre"
glass_desc = "A classic mix of rum, cola, and lime. A favorite of revolutionaries everywhere!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/carbon/M)
if(M.mind && M.mind.has_antag_datum(/datum/antagonist/rev)) //Cuba Libre, the traditional drink of revolutions! Heals revolutionaries.
@@ -606,6 +634,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "whiskeycolaglass"
glass_name = "whiskey cola"
glass_desc = "An innocent-looking mixture of cola and whiskey. Delicious."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/martini
@@ -618,6 +647,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "martiniglass"
glass_name = "Classic Martini"
glass_desc = "Damn, the bartender even stirred it, not shook it."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/vodkamartini
name = "Vodka Martini"
@@ -629,6 +659,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "martiniglass"
glass_name = "Vodka martini"
glass_desc ="A bastardisation of the classic martini. Still great."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/white_russian
name = "White Russian"
@@ -640,6 +671,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "whiterussianglass"
glass_name = "White Russian"
glass_desc = "A very nice looking drink. But that's just, like, your opinion, man."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/screwdrivercocktail
name = "Screwdriver"
@@ -651,6 +683,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "screwdriverglass"
glass_name = "Screwdriver"
glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_life(mob/living/carbon/M)
var/obj/item/organ/liver/liver = M.getorganslot(ORGAN_SLOT_LIVER)
@@ -668,6 +701,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "booger"
glass_name = "Booger"
glass_desc = "Ewww..."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/bloody_mary
name = "Bloody Mary"
@@ -679,6 +713,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "bloodymaryglass"
glass_name = "Bloody Mary"
glass_desc = "Tomato juice, mixed with Vodka and a li'l bit of lime. Tastes like liquid murder."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/C)
if(C.blood_volume < BLOOD_VOLUME_NORMAL)
@@ -695,6 +730,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "bravebullglass"
glass_name = "Brave Bull"
glass_desc = "Tequila and Coffee liqueur, brought together in a mouthwatering mixture. Drink up."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
var/tough_text
/datum/reagent/consumable/ethanol/brave_bull/on_mob_metabolize(mob/living/M)
@@ -718,6 +754,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "tequilasunriseglass"
glass_name = "tequila Sunrise"
glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
var/obj/effect/light_holder
/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_metabolize(mob/living/M)
@@ -747,6 +784,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Toxins Special"
glass_desc = "Whoah, this thing is on FIRE!"
shot_glass_icon_state = "toxinsspecialglass"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/M)
M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal() + 20) //310.15 is the normal bodytemp.
@@ -766,6 +804,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
overdose_threshold = 40
var/datum/brain_trauma/special/beepsky/B
ph = 2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_metabolize(mob/living/carbon/M)
if(HAS_TRAIT(M, TRAIT_ALCOHOL_TOLERANCE))
@@ -811,6 +850,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "irishcreamglass"
glass_name = "Irish Cream"
glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/manly_dorf
name = "The Manly Dorf"
@@ -822,6 +862,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "manlydorfglass"
glass_name = "The Manly Dorf"
glass_desc = "A manly concoction made from Ale and Beer. Intended for true men only."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
var/dorf_mode
/datum/reagent/consumable/ethanol/manly_dorf/on_mob_metabolize(mob/living/M)
@@ -848,6 +889,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "longislandicedteaglass"
glass_name = "Long Island Iced Tea"
glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/moonshine
@@ -859,6 +901,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "glass_clear"
glass_name = "Moonshine"
glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/b52
name = "B-52"
@@ -871,6 +914,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "B-52"
glass_desc = "Kahlua, Irish Cream, and cognac. You will get bombed."
shot_glass_icon_state = "b52glass"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/b52/on_mob_metabolize(mob/living/M)
playsound(M, 'sound/effects/explosion_distant.ogg', 100, FALSE)
@@ -885,6 +929,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "irishcoffeeglass"
glass_name = "Irish Coffee"
glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/margarita
name = "Margarita"
@@ -896,6 +941,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "margaritaglass"
glass_name = "Margarita"
glass_desc = "On the rocks with salt on the rim. Arriba~!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/black_russian
name = "Black Russian"
@@ -907,6 +953,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "blackrussianglass"
glass_name = "Black Russian"
glass_desc = "For the lactose-intolerant. Still as classy as a White Russian."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/manhattan
@@ -919,6 +966,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "manhattanglass"
glass_name = "Manhattan"
glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/manhattan_proj
@@ -931,6 +979,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "proj_manhattanglass"
glass_name = "Manhattan Project"
glass_desc = "A scientist's drink of choice, for thinking how to blow up the station."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/M)
@@ -947,6 +996,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "whiskeysodaglass2"
glass_name = "whiskey soda"
glass_desc = "Ultimate refreshment."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/antifreeze
name = "Anti-freeze"
@@ -958,6 +1008,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "antifreeze"
glass_name = "Anti-freeze"
glass_desc = "The ultimate refreshment."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(20 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal() + 20) //310.15 is the normal bodytemp.
@@ -973,6 +1024,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "b&p"
glass_name = "Barefoot"
glass_desc = "Barefoot and pregnant."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/carbon/M)
if(ishuman(M)) //Barefoot causes the imbiber to quickly regenerate brute trauma if they're not wearing shoes.
@@ -992,6 +1044,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "snowwhite"
glass_name = "Snow White"
glass_desc = "A cold refreshment."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/demonsblood //Prevents the imbiber from being dragged into a pool of blood by a slaughter demon.
name = "Demon's Blood"
@@ -1003,6 +1056,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "demonsblood"
glass_name = "Demons Blood"
glass_desc = "Just looking at this thing makes the hair at the back of your neck stand up."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/devilskiss //If eaten by a slaughter demon, the demon will regret it.
name = "Devil's Kiss"
@@ -1014,6 +1068,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "devilskiss"
glass_name = "Devils Kiss"
glass_desc = "Creepy time!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/vodkatonic
name = "Vodka and Tonic"
@@ -1025,6 +1080,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "vodkatonicglass"
glass_name = "vodka and tonic"
glass_desc = "For when a gin and tonic isn't Russian enough."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/ginfizz
@@ -1037,6 +1093,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "ginfizzglass"
glass_name = "gin fizz"
glass_desc = "Refreshingly lemony, deliciously dry."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/bahama_mama
@@ -1049,6 +1106,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "bahama_mama"
glass_name = "Bahama Mama"
glass_desc = "A tropical cocktail with a complex blend of flavors."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/singulo
name = "Singulo"
@@ -1060,6 +1118,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "singulo"
glass_name = "Singulo"
glass_desc = "A blue-space beverage."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/sbiten
name = "Sbiten"
@@ -1071,6 +1130,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "sbitenglass"
glass_name = "Sbiten"
glass_desc = "A spicy mix of Vodka and Spice. Very hot."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(50 * TEMPERATURE_DAMAGE_COEFFICIENT, 0 ,BODYTEMP_HEAT_DAMAGE_LIMIT) //310.15 is the normal bodytemp.
@@ -1086,6 +1146,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "red_meadglass"
glass_name = "Red Mead"
glass_desc = "A true Viking's beverage, made with the blood of their enemies."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/mead
name = "Mead"
@@ -1098,6 +1159,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "meadglass"
glass_name = "Mead"
glass_desc = "A drink from Valhalla."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/iced_beer
name = "Iced Beer"
@@ -1108,6 +1170,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "iced_beerglass"
glass_name = "iced beer"
glass_desc = "A beer so frosty, the air around it freezes."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C) //310.15 is the normal bodytemp.
@@ -1122,6 +1185,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "grogglass"
glass_name = "Grog"
glass_desc = "A fine and cepa drink for Space."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/aloe
@@ -1134,6 +1198,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "aloe"
glass_name = "Aloe"
glass_desc = "Very, very, very good."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/andalusia
name = "Andalusia"
@@ -1145,6 +1210,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "andalusia"
glass_name = "Andalusia"
glass_desc = "A nice, strangely named drink."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/alliescocktail
name = "Allies Cocktail"
@@ -1156,6 +1222,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "alliescocktail"
glass_name = "Allies cocktail"
glass_desc = "A drink made from your allies."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/acid_spit
name = "Acid Spit"
@@ -1167,6 +1234,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "acidspitglass"
glass_name = "Acid Spit"
glass_desc = "A drink from Nanotrasen. Made from live aliens."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/amasec
name = "Amasec"
@@ -1178,6 +1246,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "amasecglass"
glass_name = "Amasec"
glass_desc = "Always handy before COMBAT!!!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/changelingsting
name = "Changeling Sting"
@@ -1189,6 +1258,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "changelingsting"
glass_name = "Changeling Sting"
glass_desc = "A stingy drink."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/carbon/M)
if(M.mind) //Changeling Sting assists in the recharging of changeling chemicals.
@@ -1208,6 +1278,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "irishcarbomb"
glass_name = "Irish Car Bomb"
glass_desc = "An Irish car bomb."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/syndicatebomb
name = "Syndicate Bomb"
@@ -1219,6 +1290,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "syndicatebomb"
glass_name = "Syndicate Bomb"
glass_desc = "A syndicate bomb."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/M)
if(prob(5))
@@ -1235,6 +1307,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "hiveminderaser"
glass_name = "Hivemind Eraser"
glass_desc = "For when even mindshields can't save you."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/erikasurprise
name = "Erika Surprise"
@@ -1246,6 +1319,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "erikasurprise"
glass_name = "Erika Surprise"
glass_desc = "The surprise is, it's green!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/driestmartini
name = "Driest Martini"
@@ -1258,6 +1332,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "driestmartiniglass"
glass_name = "Driest Martini"
glass_desc = "Only for the experienced. You think you see sand floating in the glass."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/bananahonk
name = "Banana Honk"
@@ -1270,6 +1345,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "bananahonkglass"
glass_name = "Banana Honk"
glass_desc = "A drink from Clown Heaven."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/carbon/M)
var/obj/item/organ/liver/liver = M.getorganslot(ORGAN_SLOT_LIVER)
@@ -1289,6 +1365,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "silencerglass"
glass_name = "Silencer"
glass_desc = "A drink from Mime Heaven."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/M)
if(ishuman(M) && M.mind?.miming)
@@ -1307,6 +1384,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "drunkenblumpkin"
glass_name = "Drunken Blumpkin"
glass_desc = "A drink for the drunks."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/whiskey_sour //Requested since we had whiskey cola and soda but not sour.
name = "Whiskey Sour"
@@ -1330,6 +1408,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "hard cider"
glass_desc = "Tastes like autumn... no wait, fall!"
shot_glass_icon_state = "shotglassbrown"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/fetching_fizz //A reference to one of my favorite games of all time. Pulls nearby ores to the imbiber!
@@ -1343,6 +1422,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "fetching_fizz"
glass_name = "Fetching Fizz"
glass_desc = "Induces magnetism in the imbiber. Started as a barroom prank but evolved to become popular with miners and scrappers. Metallic aftertaste."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/carbon/M)
@@ -1362,6 +1442,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "hearty_punch"
glass_name = "Hearty Punch"
glass_desc = "Aromatic beverage served piping hot. According to folk tales it can almost wake the dead."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/carbon/M)
if(M.health <= 0)
@@ -1382,6 +1463,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "glass_brown2"
glass_name = "Bacchus' Blessing"
glass_desc = "You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -1395,6 +1477,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "atomicbombglass"
glass_name = "Atomic Bomb"
glass_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/M)
M.set_drugginess(50)
@@ -1424,6 +1507,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "gargleblasterglass"
glass_name = "Pan-Galactic Gargle Blaster"
glass_desc = "Like having your brain smashed out by a slice of lemon wrapped around a large gold brick."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/carbon/M)
M.dizziness +=1.5
@@ -1453,6 +1537,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "neurotoxinglass"
glass_name = "Neurotoxin"
glass_desc = "A drink that is guaranteed to knock you silly."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/neurotoxin/proc/pickt()
return (pick(TRAIT_PARALYSIS_L_ARM,TRAIT_PARALYSIS_R_ARM,TRAIT_PARALYSIS_R_LEG,TRAIT_PARALYSIS_L_LEG))
@@ -1500,6 +1585,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "hippiesdelightglass"
glass_name = "Hippie's Delight"
glass_desc = "A drink enjoyed by people during the 1960's."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/M)
if (!M.slurring)
@@ -1544,6 +1630,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "glass_yellow"
glass_name = "eggnog"
glass_desc = "For enjoying the most wonderful time of the year."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/narsour
@@ -1556,6 +1643,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "narsour"
glass_name = "Nar'Sour"
glass_desc = "A new hit cocktail inspired by THE ARM Breweries will have you shouting Fuu ma'jin in no time!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/carbon/M)
M.cultslurring = min(M.cultslurring + 3, 3)
@@ -1571,6 +1659,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "glass_orange"
glass_name = "Triple Sec"
glass_desc = "A glass of straight Triple Sec."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/creme_de_menthe
name = "Creme de Menthe"
@@ -1581,6 +1670,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "glass_green"
glass_name = "Creme de Menthe"
glass_desc = "You can almost feel the first breath of spring just looking at it."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/creme_de_cacao
name = "Creme de Cacao"
@@ -1591,6 +1681,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "glass_brown"
glass_name = "Creme de Cacao"
glass_desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/creme_de_coconut
name = "Creme de Coconut"
@@ -1601,6 +1692,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "glass_white"
glass_name = "Creme de Coconut"
glass_desc = "An unintimidating glass of coconut liqueur."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/quadruple_sec
name = "Quadruple Sec"
@@ -1612,6 +1704,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "quadruple_sec"
glass_name = "Quadruple Sec"
glass_desc = "An intimidating and lawful beverage dares you to violate the law and make its day. Still can't drink it on duty, though."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/M)
//Securidrink in line with the Screwdriver for engineers or Nothing for mimes
@@ -1634,6 +1727,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "quintuple_sec"
glass_name = "Quintuple Sec"
glass_desc = "Now you are become law, destroyer of clowns."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/M)
//Securidrink in line with the Screwdriver for engineers or Nothing for mimes but STRONG..
@@ -1657,6 +1751,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "grasshopper"
glass_name = "Grasshopper"
glass_desc = "You weren't aware edible beverages could be that green."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/stinger
name = "Stinger"
@@ -1668,6 +1763,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "stinger"
glass_name = "Stinger"
glass_desc = "You wonder what would happen if you pointed this at a heat source..."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/bastion_bourbon
name = "Bastion Bourbon"
@@ -1682,6 +1778,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "If you're feeling low, count on the buttery flavor of our own bastion bourbon."
shot_glass_icon_state = "shotglassgreen"
ph = 4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/bastion_bourbon/on_mob_metabolize(mob/living/L)
var/heal_points = 10
@@ -1718,6 +1815,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Squirt Cider"
glass_desc = "Squirt cider will toughen you right up. Too bad about the musty aftertaste."
shot_glass_icon_state = "shotglassgreen"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/carbon/M)
M.satiety += 5 //for context, vitamins give 30 satiety per tick
@@ -1734,6 +1832,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "fringe_weaver"
glass_name = "Fringe Weaver"
glass_desc = "It's a wonder it doesn't spill out of the glass."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/sugar_rush
name = "Sugar Rush"
@@ -1746,6 +1845,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "sugar_rush"
glass_name = "Sugar Rush"
glass_desc = "If you can't mix a Sugar Rush, you can't tend bar."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/sugar_rush/on_mob_life(mob/living/carbon/M)
M.satiety -= 10 //junky as hell! a whole glass will keep you from being able to eat junk food
@@ -1762,6 +1862,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "crevice_spike"
glass_name = "Crevice Spike"
glass_desc = "It'll either knock the drunkenness out of you or knock you out cold. Both, probably."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/crevice_spike/on_mob_metabolize(mob/living/L) //damage only applies when drink first enters system and won't again until drink metabolizes out
L.adjustBruteLoss(3 * min(5,volume)) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15
@@ -1775,6 +1876,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "sakecup"
glass_name = "cup of sake"
glass_desc = "A traditional cup of sake."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/peppermint_patty
name = "Peppermint Patty"
@@ -1786,6 +1888,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "peppermint_patty"
glass_name = "Peppermint Patty"
glass_desc = "A boozy minty hot cocoa that warms your belly on a cold night."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/M)
M.apply_status_effect(/datum/status_effect/throat_soothed)
@@ -1802,6 +1905,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "alexander"
glass_name = "Alexander"
glass_desc = "A creamy, indulgent delight that is stronger than it seems."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
var/obj/item/shield/mighty_shield
/datum/reagent/consumable/ethanol/alexander/on_mob_metabolize(mob/living/L)
@@ -1834,6 +1938,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "alexanderam"
glass_name = "Amaretto Alexander"
glass_desc = "A creamy, indulgent delight that is in fact as gentle as it seems."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/sidecar
name = "Sidecar"
@@ -1845,6 +1950,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "sidecar"
glass_name = "Sidecar"
glass_desc = "The one ride you'll gladly give up the wheel for."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/between_the_sheets
name = "Between the Sheets"
@@ -1856,6 +1962,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "between_the_sheets"
glass_name = "Between the Sheets"
glass_desc = "The only drink that comes with a label reminding you of Nanotrasen's zero-tolerance promiscuity policy."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/L)
..()
@@ -1880,6 +1987,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "kamikaze"
glass_name = "Kamikaze"
glass_desc = "Divinely windy."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/mojito
name = "Mojito"
@@ -1891,6 +1999,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "mojito"
glass_name = "Mojito"
glass_desc = "A drink that looks as refreshing as it tastes."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/moscow_mule
name = "Moscow Mule"
@@ -1902,6 +2011,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "moscow_mule"
glass_name = "Moscow Mule"
glass_desc = "A chilly drink that reminds you of the Derelict."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/fernet
name = "Fernet"
@@ -1911,6 +2021,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
taste_description = "utter bitterness"
glass_name = "glass of fernet"
glass_desc = "A glass of pure Fernet. Only an absolute madman would drink this alone." //Hi Kevum
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
@@ -1929,6 +2040,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "godlyblend"
glass_name = "glass of fernet cola"
glass_desc = "A sawed-off cola bottle filled with Fernet Cola. Nothing better after eating like a lardass."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/fernet_cola/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
@@ -1948,6 +2060,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "fanciulli"
glass_name = "glass of fanciulli"
glass_desc = "A glass of Fanciulli. It's just Manhattan with Fernet."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/M)
M.adjust_nutrition(-5)
@@ -1971,6 +2084,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state= "minted_fernet"
glass_name = "glass of branca menta"
glass_desc = "A glass of Branca Menta, perfect for those lazy and hot Sunday summer afternoons." //Get lazy literally by drinking this
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/M)
@@ -1994,6 +2108,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "blank_paper"
glass_name = "glass of blank paper"
glass_desc = "A fizzy cocktail for those looking to start fresh."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/blank_paper/on_mob_life(mob/living/carbon/M)
if(ishuman(M) && M.mind?.miming)
@@ -2009,7 +2124,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
boozepwr = 35
quality = DRINK_GOOD
taste_description = "bad coding"
can_synth = FALSE
var/list/names = list("null fruit" = 1) //Names of the fruits used. Associative list where name is key, value is the percentage of that fruit.
var/list/tastes = list("bad coding" = 1) //List of tastes. See above.
ph = 4
@@ -2115,6 +2229,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "champagne_glass"
glass_name = "Champagne"
glass_desc = "The flute clearly displays the slowly rising bubbles."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/wizz_fizz
@@ -2127,6 +2242,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "wizz_fizz"
glass_name = "Wizz Fizz"
glass_desc = "The glass bubbles and froths with an almost magical intensity."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/wizz_fizz/on_mob_life(mob/living/carbon/M)
//A healing drink similar to Quadruple Sec, Ling Stings, and Screwdrivers for the Wizznerds; the check is consistent with the changeling sting
@@ -2146,6 +2262,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "bug_spray"
glass_name = "Bug Spray"
glass_desc = "Your eyes begin to water as the sting of alcohol reaches them."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/M)
//Bugs should not drink Bug spray.
@@ -2168,6 +2285,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "applejack_glass"
glass_name = "Applejack"
glass_desc = "You feel like you could drink this all neight."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/jack_rose
name = "Jack Rose"
@@ -2179,6 +2297,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "jack_rose"
glass_name = "Jack Rose"
glass_desc = "Enough of these, and you really will start to suppose your toeses are roses."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/turbo
name = "Turbo"
@@ -2190,6 +2309,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "turbo"
glass_name = "Turbo"
glass_desc = "A turbulent cocktail for outlaw hoverbikers."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/turbo/on_mob_life(mob/living/carbon/M)
if(prob(4))
@@ -2207,6 +2327,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "old_timer"
glass_name = "Old Timer"
glass_desc = "WARNING! May cause premature aging!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/old_timer/on_mob_life(mob/living/carbon/M)
if(prob(20))
@@ -2239,6 +2360,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "rubberneck"
glass_name = "Rubberneck"
glass_desc = "A popular drink amongst those adhering to an all synthetic diet."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/rubberneck/on_mob_metabolize(mob/living/L)
. = ..()
@@ -2258,6 +2380,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "duplex"
glass_name = "Duplex"
glass_desc = "To imbibe one component separately from the other is consider a great faux pas."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/trappist
name = "Trappist Beer"
@@ -2269,6 +2392,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "trappistglass"
glass_name = "Trappist Beer"
glass_desc = "boozy Catholicism in a glass."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/trappist/on_mob_life(mob/living/carbon/M)
if(M.mind?.holy_role)
@@ -2320,6 +2444,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "mauna_loa"
glass_name = "Mauna Loa"
glass_desc = "Lavaland in a drink... mug... volcano... thing."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/M)
// Heats the user up while the reagent is in the body. Occasionally makes you burst into flames.
@@ -2339,6 +2464,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "painkiller"
glass_name = "Painkiller"
glass_desc = "A combination of tropical juices and rum. Surely this will make you feel better."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/pina_colada
name = "Pina Colada"
@@ -2361,6 +2487,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "glass_orange"
glass_name = "glass of pruno"
glass_desc = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/pruno/on_mob_life(mob/living/carbon/M)
M.adjust_disgust(5)
@@ -2376,6 +2503,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "gingeramaretto"
glass_name = "Ginger Amaretto"
glass_desc = "The sprig of rosemary adds a nice aroma to the drink, and isn't just to be pretentious afterall!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/godfather
name = "Godfather"
@@ -2387,6 +2515,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "godfather"
glass_name = "Godfather"
glass_desc = "A classic from old Italy and enjoyed by gangsters, pray the orange peel doesnt end up in your mouth."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ethanol/godmother
name = "Godmother"
@@ -2398,3 +2527,5 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "godmother"
glass_name = "Godmother"
glass_desc = "A lovely fresh smelling cocktail, a true Sicilian delight."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED

14
code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
View File

@@ -15,6 +15,7 @@
reagent_state = SOLID
var/helbent = FALSE
var/reaping = FALSE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/helbital/on_mob_life(mob/living/carbon/M)
. = TRUE
@@ -84,6 +85,7 @@
color = "#ECEC8D" // rgb: 236 236 141
taste_description = "bitter with a hint of alcohol"
reagent_state = SOLID
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/libital/on_mob_life(mob/living/carbon/M)
M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.3*REM)
@@ -97,6 +99,7 @@
reagent_state = SOLID
color = "#FFFF6B"
overdose_threshold = 20
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/probital/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-2.25*REM, FALSE)
@@ -141,6 +144,7 @@
color = "#6171FF"
var/resetting_probability = 0
var/spammer = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/lenturi/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(-3 * REM)
@@ -163,6 +167,7 @@
color = "#8C93FF"
var/resetting_probability = 0
var/message_cd = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/aiuri/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(-2*REM)
@@ -177,6 +182,7 @@
color = "#F7FFA5"
overdose_threshold = 25
reagent_weight = 0.6
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/hercuri/on_mob_life(mob/living/carbon/M)
if(M.getFireLoss() > 50)
@@ -220,6 +226,7 @@
reagent_state = LIQUID
color = "#FF6464"
overdose_threshold = 35 // at least 2 full syringes +some, this stuff is nasty if left in for long
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/convermol/on_mob_life(mob/living/carbon/human/M)
var/oxycalc = 2.5*REM*current_cycle
@@ -244,6 +251,7 @@
description = "An oxygen deprivation medication that causes fatigue. Prolonged exposure causes the patient to fall asleep once the medicine metabolizes."
color = "#FF6464"
var/drowsycd = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/tirimol/on_mob_life(mob/living/carbon/human/M)
M.adjustOxyLoss(-3)
@@ -268,6 +276,7 @@
name = "Seiver"
description = "A medicine that shifts functionality based on temperature. Colder temperatures incurs radiation removal while hotter temperatures promote antitoxicity. Damages the heart." //CHEM HOLDER TEMPS, NOT AIR TEMPS
var/radbonustemp = (T0C - 100) //being below this number gives you 10% off rads.
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/seiver/on_mob_metabolize(mob/living/carbon/human/M)
. = ..()
@@ -305,6 +314,7 @@
/datum/reagent/medicine/c2/multiver //enhanced with MULTIple medicines
name = "Multiver"
description = "A chem-purger that becomes more effective the more unique medicines present. Slightly heals toxicity but causes lung damage (mitigatable by unique medicines)."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/multiver/on_mob_life(mob/living/carbon/human/M)
var/medibonus = 0 //it will always have itself which makes it REALLY start @ 1
@@ -340,6 +350,7 @@
metabolization_rate = 0.75 * REAGENTS_METABOLISM
overdose_threshold = 6
var/conversion_amount
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/syriniver/on_transfer(atom/A, methods=INJECT, trans_volume)
if(!(methods & INJECT) || !iscarbon(A))
@@ -381,6 +392,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 25
var/datum/brain_trauma/mild/muscle_weakness/U
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/musiver/on_mob_life(mob/living/carbon/M)
M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.1)
@@ -416,6 +428,7 @@
description = "Heals brute and burn damage at the cost of toxicity (66% of damage healed). 100u or more can restore corpses husked by burns. Touch application only."
reagent_state = LIQUID
color = "#FFEBEB"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/synthflesh/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE)
. = ..()
@@ -456,6 +469,7 @@
description = "An expensive medicine that aids with pumping blood around the body even without a heart, and prevents the heart from slowing down. Mixing it with epinephrine or atropine will cause an explosion."
color = "#F5F5F5"
overdose_threshold = 50
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/c2/penthrite/on_mob_metabolize(mob/living/M)
. = ..()

62
code/modules/reagents/chemistry/reagents/drink_reagents.dm
View File

@@ -13,6 +13,7 @@
glass_name = "glass of orange juice"
glass_desc = "Vitamins! Yay!"
ph = 3.3
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/M)
if(M.getOxyLoss() && prob(30))
@@ -28,6 +29,7 @@
glass_icon_state = "glass_red"
glass_name = "glass of tomato juice"
glass_desc = "Are you sure this is tomato juice?"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/M)
if(M.getFireLoss() && prob(20))
@@ -44,6 +46,7 @@
glass_name = "glass of lime juice"
glass_desc = "A glass of sweet-sour lime juice."
ph = 2.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/M)
if(M.getToxLoss() && prob(20))
@@ -59,6 +62,7 @@
glass_icon_state = "carrotjuice"
glass_name = "glass of carrot juice"
glass_desc = "It's just like a carrot but without crunching."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/M)
M.adjust_blurriness(-1)
@@ -80,6 +84,7 @@
glass_icon_state = "berryjuice"
glass_name = "glass of berry juice"
glass_desc = "Berry juice. Or maybe it's jam. Who cares?"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/applejuice
name = "Apple Juice"
@@ -96,6 +101,7 @@
glass_icon_state = "poisonberryjuice"
glass_name = "glass of berry juice"
glass_desc = "Berry juice. Or maybe it's poison. Who cares?"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(1, 0)
@@ -110,6 +116,7 @@
glass_icon_state = "glass_red"
glass_name = "glass of watermelon juice"
glass_desc = "A glass of watermelon juice."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/lemonjuice
name = "Lemon Juice"
@@ -120,6 +127,7 @@
glass_name = "glass of lemon juice"
glass_desc = "Sour..."
ph = 2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/banana
name = "Banana Juice"
@@ -129,6 +137,7 @@
glass_icon_state = "banana"
glass_name = "glass of banana juice"
glass_desc = "The raw essence of a banana. HONK."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/banana/on_mob_life(mob/living/carbon/M)
var/obj/item/organ/liver/liver = M.getorganslot(ORGAN_SLOT_LIVER)
@@ -145,6 +154,7 @@
glass_name = "nothing"
glass_desc = "Absolutely nothing."
shot_glass_icon_state = "shotglass"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/nothing/on_mob_life(mob/living/carbon/M)
if(ishuman(M) && M.mind?.miming)
@@ -159,6 +169,7 @@
metabolization_rate = INFINITY
color = "#FF4DD2"
taste_description = "laughter"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/laughter/on_mob_life(mob/living/carbon/M)
M.emote("laugh")
@@ -171,6 +182,7 @@
metabolization_rate = 1.5 * REAGENTS_METABOLISM
color = "#FF4DD2"
taste_description = "laughter"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/superlaughter/on_mob_life(mob/living/carbon/M)
if(prob(30))
@@ -188,12 +200,14 @@
glass_icon_state = "glass_brown"
glass_name = "glass of potato juice"
glass_desc = "Bleh..."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/grapejuice
name = "Grape Juice"
description = "The juice of a bunch of grapes. Guaranteed non-alcoholic."
color = "#290029" // dark purple
taste_description = "grape soda"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/milk
name = "Milk"
@@ -204,6 +218,7 @@
glass_name = "glass of milk"
glass_desc = "White and nutritious goodness!"
ph = 6.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
// Milk is good for humans, but bad for plants. The sugars cannot be used by plants, and the milk fat harms growth. Not shrooms though. I can't deal with this now...
/datum/reagent/consumable/milk/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -229,6 +244,7 @@
glass_icon_state = "glass_white"
glass_name = "glass of soy milk"
glass_desc = "White and nutritious soy goodness!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() && prob(20))
@@ -244,6 +260,7 @@
glass_icon_state = "glass_white"
glass_name = "glass of cream"
glass_desc = "Ewwww..."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() && prob(20))
@@ -261,6 +278,7 @@
glass_icon_state = "glass_brown"
glass_name = "glass of coffee"
glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/coffee/overdose_process(mob/living/M)
M.Jitter(5)
@@ -286,6 +304,7 @@
glass_icon_state = "teaglass"
glass_name = "glass of tea"
glass_desc = "Drinking it from here would not seem right."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/tea/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-2)
@@ -307,6 +326,7 @@
glass_icon_state = "lemonpitcher"
glass_name = "pitcher of lemonade"
glass_desc = "This drink leaves you feeling nostalgic for some reason."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/tea/arnold_palmer
name = "Arnold Palmer"
@@ -318,6 +338,7 @@
glass_icon_state = "arnold_palmer"
glass_name = "Arnold Palmer"
glass_desc = "You feel like taking a few golf swings after a few swigs of this."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/M)
if(prob(5))
@@ -334,6 +355,7 @@
glass_icon_state = "icedcoffeeglass"
glass_name = "iced coffee"
glass_desc = "A drink to perk you up and refresh you!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
@@ -353,6 +375,7 @@
glass_icon_state = "hoticecoffee"
glass_name = "hot ice coffee"
glass_desc = "A sharp drink, this can't have come cheap"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/hot_ice_coffee/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
@@ -373,6 +396,7 @@
glass_icon_state = "icedteaglass"
glass_name = "iced tea"
glass_desc = "All natural, antioxidant-rich flavour sensation."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/icetea/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-2)
@@ -392,6 +416,7 @@
glass_icon_state = "glass_brown"
glass_name = "glass of Space Cola"
glass_desc = "A glass of refreshing Space Cola."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-5)
@@ -407,6 +432,7 @@
glass_icon_state = "nuka_colaglass"
glass_name = "glass of Nuka Cola"
glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/nuka_cola/on_mob_metabolize(mob/living/L)
..()
@@ -435,6 +461,7 @@
glass_icon_state = "grey_bull_glass"
glass_name = "glass of Grey Bull"
glass_desc = "Surprisingly it isn't grey."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/grey_bull/on_mob_metabolize(mob/living/L)
..()
@@ -460,6 +487,7 @@
glass_icon_state = "Space_mountain_wind_glass"
glass_name = "glass of Space Mountain Wind"
glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-7)
@@ -477,6 +505,7 @@
glass_icon_state = "dr_gibb_glass"
glass_name = "glass of Dr. Gibb"
glass_desc = "Dr. Gibb. Not as dangerous as the glass_name might imply."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-6)
@@ -491,6 +520,7 @@
glass_icon_state = "space-up_glass"
glass_name = "glass of Space-Up"
glass_desc = "Space-up. It helps you keep your cool."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/space_up/on_mob_life(mob/living/carbon/M)
@@ -505,6 +535,7 @@
glass_icon_state = "glass_yellow"
glass_name = "glass of lemon-lime"
glass_desc = "You're pretty certain a real fruit has never actually touched this."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/carbon/M)
@@ -520,6 +551,7 @@
glass_icon_state = "glass_red"
glass_name = "glass of Pwr Game"
glass_desc = "Goes well with a Vlad's salad."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/pwr_game/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)
. = ..()
@@ -542,6 +574,7 @@
glass_icon_state = "glass_red"
glass_name = "glass of Shambler's juice"
glass_desc = "Mmm mm, shambly."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
@@ -554,6 +587,7 @@
glass_icon_state = "glass_clear"
glass_name = "glass of soda water"
glass_desc = "Soda water. Why not make a scotch and soda?"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
// A variety of nutrients are dissolved in club soda, without sugar.
@@ -578,6 +612,7 @@
glass_icon_state = "glass_clear"
glass_name = "glass of tonic water"
glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/tonic/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
@@ -596,6 +631,7 @@
glass_icon_state = "monkey_energy_glass"
glass_name = "glass of Monkey Energy"
glass_desc = "You can unleash the ape, but without the pop of the can?"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/monkey_energy/on_mob_life(mob/living/carbon/M)
M.Jitter(20)
@@ -628,6 +664,7 @@
glass_icon_state = "iceglass"
glass_name = "glass of ice"
glass_desc = "Generally, you're supposed to put something else in there too..."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
@@ -642,6 +679,7 @@
glass_icon_state = "soy_latte"
glass_name = "soy latte"
glass_desc = "A nice and refreshing beverage while you're reading."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
@@ -663,6 +701,7 @@
glass_icon_state = "cafe_latte"
glass_name = "cafe latte"
glass_desc = "A nice, strong and refreshing beverage while you're reading."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
@@ -684,6 +723,7 @@
glass_icon_state = "doctorsdelightglass"
glass_name = "Doctor's Delight"
glass_desc = "The space doctor's favorite. Guaranteed to restore bodily injury; side effects include cravings and hunger."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-0.5, 0)
@@ -708,6 +748,7 @@
glass_icon_state = "cherryshake"
glass_name = "cherry shake"
glass_desc = "A cherry flavored milkshake."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/bluecherryshake
name = "Blue Cherry Shake"
@@ -719,6 +760,7 @@
glass_icon_state = "bluecherryshake"
glass_name = "blue cherry shake"
glass_desc = "An exotic blue milkshake."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/pumpkin_latte
name = "Pumpkin Latte"
@@ -730,6 +772,7 @@
glass_icon_state = "pumpkin_latte"
glass_name = "pumpkin latte"
glass_desc = "A mix of coffee and pumpkin juice."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/gibbfloats
name = "Gibb Floats"
@@ -741,18 +784,21 @@
glass_icon_state = "gibbfloats"
glass_name = "Gibbfloat"
glass_desc = "Dr. Gibb with ice cream on top."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/pumpkinjuice
name = "Pumpkin Juice"
description = "Juiced from real pumpkin."
color = "#FFA500"
taste_description = "pumpkin"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/blumpkinjuice
name = "Blumpkin Juice"
description = "Juiced from real blumpkin."
color = "#00BFFF"
taste_description = "a mouthful of pool water"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/triple_citrus
name = "Triple Citrus"
@@ -763,6 +809,7 @@
glass_icon_state = "triplecitrus" //needs own sprite mine are trash //your sprite is great tho
glass_name = "glass of triple citrus"
glass_desc = "A mixture of citrus juices. Tangy, yet smooth."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/grape_soda
name = "Grape soda"
@@ -771,6 +818,7 @@
taste_description = "grape soda"
glass_name = "glass of grape juice"
glass_desc = "It's grape (soda)!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
@@ -782,6 +830,7 @@
color = "#7D4E29"
quality = DRINK_NICE
taste_description = "chocolate milk"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/hot_coco
name = "Hot Coco"
@@ -792,6 +841,7 @@
glass_icon_state = "chocolateglass"
glass_name = "glass of hot coco"
glass_desc = "A favorite winter drink to warm you up."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
@@ -813,6 +863,7 @@
glass_icon_state = "glass_green"
glass_name = "glass of menthol"
glass_desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/menthol/on_mob_life(mob/living/L)
L.apply_status_effect(/datum/status_effect/throat_soothed)
@@ -825,6 +876,7 @@
taste_description = "sweet pomegranates"
glass_name = "glass of grenadine"
glass_desc = "Delicious flavored syrup."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/parsnipjuice
name = "Parsnip Juice"
@@ -832,6 +884,7 @@
color = "#FFA500"
taste_description = "parsnip"
glass_name = "glass of parsnip juice"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/pineapplejuice
name = "Pineapple Juice"
@@ -840,6 +893,7 @@
taste_description = "pineapple"
glass_name = "glass of pineapple juice"
glass_desc = "Tart, tropical, and hotly debated."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/peachjuice //Intended to be extremely rare due to being the limiting ingredients in the blazaam drink
name = "Peach Juice"
@@ -847,6 +901,7 @@
color = "#E78108"
taste_description = "peaches"
glass_name = "glass of peach juice"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/cream_soda
name = "Cream Soda"
@@ -857,6 +912,7 @@
glass_icon_state = "cream_soda"
glass_name = "Cream Soda"
glass_desc = "A classic space-American vanilla flavored soft drink."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
@@ -870,6 +926,7 @@
taste_description = "sweet ginger spice"
glass_name = "Sol Dry"
glass_desc = "A soothing, mellow drink made from ginger."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/M)
M.adjust_disgust(-5)
@@ -885,6 +942,7 @@
glass_name = "Red Queen"
glass_desc = "DRINK ME."
var/current_size = RESIZE_DEFAULT_SIZE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/H)
if(prob(75))
@@ -912,6 +970,7 @@
glass_icon_state = "glass_yellow"
glass_name = "glass of bungo juice"
glass_desc = "Exotic! You feel like you are on vacation already."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/prunomix
name = "pruno mixture"
@@ -921,6 +980,7 @@
glass_icon_state = "glass_orange"
glass_name = "glass of pruno mixture"
glass_desc = "Fruit, sugar, yeast, and water pulped together into a pungent slurry."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/aloejuice
name = "Aloe Juice"
@@ -930,6 +990,7 @@
glass_icon_state = "glass_yellow"
glass_name = "glass of aloe juice"
glass_desc = "A healthy and refreshing juice."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/aloejuice/on_mob_life(mob/living/M)
if(M.getToxLoss() && prob(30))
@@ -946,6 +1007,7 @@
glass_icon_state = "lean"
glass_name = "Lean"
glass_desc = "A drink that makes your life less miserable."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/lean/on_mob_life(mob/living/carbon/M)
if(M.slurring < 3)

16
code/modules/reagents/chemistry/reagents/drug_reagents.dm
View File

@@ -14,6 +14,7 @@
color = "#60A584" // rgb: 96, 165, 132
overdose_threshold = 30
ph = 9
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/space_drugs/on_mob_life(mob/living/carbon/M)
M.set_drugginess(15)
@@ -45,6 +46,7 @@
overdose_threshold=15
metabolization_rate = 0.125 * REAGENTS_METABOLISM
ph = 8
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
//Nicotine is used as a pesticide IRL.
/datum/reagent/drug/nicotine/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -80,6 +82,7 @@
overdose_threshold = 20
addiction_threshold = 10
ph = 10
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/crank/on_mob_life(mob/living/carbon/M)
if(prob(5))
@@ -130,6 +133,7 @@
overdose_threshold = 20
addiction_threshold = 15
ph = 9
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/krokodil/on_mob_life(mob/living/carbon/M)
@@ -183,6 +187,7 @@
addiction_threshold = 10
metabolization_rate = 0.75 * REAGENTS_METABOLISM
ph = 5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/methamphetamine/on_mob_metabolize(mob/living/L)
..()
@@ -269,6 +274,7 @@
taste_description = "salt" // because they're bathsalts?
var/datum/brain_trauma/special/psychotic_brawling/bath_salts/rage
ph = 8.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/bath_salts/on_mob_metabolize(mob/living/L)
..()
@@ -365,6 +371,7 @@
description = "Amps you up, gets you going, and rapidly restores stamina damage. Side effects include breathlessness and toxicity."
reagent_state = LIQUID
color = "#78FFF0"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/aranesp/on_mob_life(mob/living/carbon/M)
var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.")
@@ -385,6 +392,7 @@
color = "#EE35FF"
addiction_threshold = 10
overdose_threshold = 20
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
taste_description = "paint thinner"
/datum/reagent/drug/happiness/on_mob_metabolize(mob/living/L)
@@ -462,6 +470,7 @@
color = "#e38e44"
metabolization_rate = 2 * REAGENTS_METABOLISM
overdose_threshold = 30
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/pumpup/on_mob_metabolize(mob/living/L)
..()
@@ -501,7 +510,6 @@
/datum/reagent/drug/maint
name = "Maintenance Drugs"
addiction_type = /datum/reagent/drug/maint
can_synth = FALSE
/datum/reagent/drug/maint/addiction_act_stage1(mob/living/M)
. = ..()
@@ -539,7 +547,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
overdose_threshold = 15
addiction_threshold = 6
can_synth = TRUE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/maint/powder/on_mob_life(mob/living/carbon/M)
. = ..()
@@ -566,7 +574,7 @@
metabolization_rate = 2 * REAGENTS_METABOLISM
overdose_threshold = 25
addiction_threshold = 10
can_synth = TRUE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/maint/sludge/on_mob_metabolize(mob/living/L)
@@ -599,7 +607,7 @@
color = "#000000"
overdose_threshold = 30
addiction_threshold = 10
can_synth = TRUE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/maint/tar/on_mob_life(mob/living/carbon/M)
. = ..()

51
code/modules/reagents/chemistry/reagents/food_reagents.dm
View File

@@ -54,6 +54,7 @@
reagent_state = SOLID
nutriment_factor = 15 * REAGENTS_METABOLISM
color = "#664330" // rgb: 102, 67, 48
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
var/brute_heal = 1
var/burn_heal = 0
@@ -110,6 +111,7 @@
/datum/reagent/consumable/nutriment/vitamin
name = "Vitamin"
description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
brute_heal = 1
burn_heal = 1
@@ -125,11 +127,13 @@
description = "A natural polyamide made up of amino acids. An essential constituent of mosts known forms of life."
brute_heal = 0.8 //Rewards the player for eating a balanced diet.
nutriment_factor = 9 * REAGENTS_METABOLISM //45% as calorie dense as corn oil.
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/nutriment/organ_tissue
name = "Organ Tissue"
description = "Natural tissues that make up the bulk of organs, providing many vitamins and minerals."
taste_description = "rich earthy pungent"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/cooking_oil
name = "Cooking Oil"
@@ -141,6 +145,7 @@
metabolization_rate = 10 * REAGENTS_METABOLISM
penetrates_skin = NONE
var/fry_temperature = 450 //Around ~350 F (117 C) which deep fryers operate around in the real world
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/cooking_oil/expose_obj(obj/exposed_obj, reac_volume)
. = ..()
@@ -195,6 +200,7 @@
metabolization_rate = 2 * REAGENTS_METABOLISM
overdose_threshold = 200 // Hyperglycaemic shock
taste_description = "sweetness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
// Plants should not have sugar, they can't use it and it prevents them getting water/ nutients, it is good for mold though...
/datum/reagent/consumable/sugar/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -219,6 +225,7 @@
nutriment_factor = 2 * REAGENTS_METABOLISM
color = "#899613" // rgb: 137, 150, 19
taste_description = "watery milk"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
// Compost for EVERYTHING
/datum/reagent/consumable/virus_food/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -232,6 +239,7 @@
nutriment_factor = 2 * REAGENTS_METABOLISM
color = "#792300" // rgb: 121, 35, 0
taste_description = "umami"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/ketchup
name = "Ketchup"
@@ -239,6 +247,7 @@
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#731008" // rgb: 115, 16, 8
taste_description = "ketchup"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/capsaicin
@@ -247,6 +256,7 @@
color = "#B31008" // rgb: 179, 16, 8
taste_description = "hot peppers"
taste_mult = 1.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/carbon/M)
var/heating = 0
@@ -278,6 +288,7 @@
color = "#8BA6E9" // rgb: 139, 166, 233
taste_description = "mint"
ph = 13 //HMM! I wonder
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/frostoil/on_mob_life(mob/living/carbon/M)
var/cooling = 0
@@ -327,6 +338,7 @@
taste_description = "scorching agony"
penetrates_skin = NONE
ph = 7.4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/condensedcapsaicin/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)
. = ..()
@@ -373,6 +385,7 @@
color = "#FFFFFF" // rgb: 255,255,255
taste_description = "salt"
penetrates_skin = NONE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/salt/expose_turf(turf/exposed_turf, reac_volume) //Creates an umbra-blocking salt pile
. = ..()
@@ -387,6 +400,7 @@
reagent_state = SOLID
// no color (ie, black)
taste_description = "pepper"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/coco
name = "Coco Powder"
@@ -395,6 +409,7 @@
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
taste_description = "bitterness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/mushroomhallucinogen
name = "Mushroom Hallucinogen"
@@ -403,6 +418,7 @@
metabolization_rate = 0.2 * REAGENTS_METABOLISM
taste_description = "mushroom"
ph = 11
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/drug/mushroomhallucinogen/on_mob_life(mob/living/carbon/M)
if(!M.slurring)
@@ -433,6 +449,7 @@
color = "#FEFEFE"
taste_description = "garlic"
metabolization_rate = 0.15 * REAGENTS_METABOLISM
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/M)
if(isvampire(M)) //incapacitating but not lethal. Unfortunately, vampires cannot vomit.
@@ -453,6 +470,7 @@
description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops."
color = "#FF00FF" // rgb: 255, 0, 255
taste_description = "childhood whimsy"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/M)
var/obj/item/organ/liver/liver = M.getorganslot(ORGAN_SLOT_LIVER)
@@ -467,6 +485,7 @@
nutriment_factor = 20 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
taste_description = "slime"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/cornoil/expose_turf(turf/open/exposed_turf, reac_volume)
. = ..()
@@ -486,6 +505,7 @@
description = "A universal enzyme used in the preparation of certain chemicals and foods."
color = "#365E30" // rgb: 54, 94, 48
taste_description = "sweetness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/dry_ramen
name = "Dry Ramen"
@@ -493,6 +513,7 @@
reagent_state = SOLID
color = "#302000" // rgb: 48, 32, 0
taste_description = "dry and cheap noodles"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/hot_ramen
name = "Hot Ramen"
@@ -500,6 +521,7 @@
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
taste_description = "wet and cheap noodles"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/nutraslop
name = "Nutraslop"
@@ -507,6 +529,7 @@
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#3E4A00" // rgb: 62, 74, 0
taste_description = "your imprisonment"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
@@ -518,6 +541,7 @@
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
taste_description = "wet and cheap noodles on fire"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/carbon/target_mob)
target_mob.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT)
@@ -529,6 +553,7 @@
reagent_state = SOLID
color = "#FFFFFF" // rgb: 0, 0, 0
taste_description = "chalky wheat"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/flour/expose_turf(turf/exposed_turf, reac_volume)
. = ..()
@@ -545,6 +570,7 @@
description = "Totally the best. Only to be spread on foods with excellent lateral symmetry."
color = "#801E28" // rgb: 128, 30, 40
taste_description = "cherry"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/bluecherryjelly
name = "Blue Cherry Jelly"
@@ -559,6 +585,7 @@
nutriment_factor = 3 * REAGENTS_METABOLISM
color = "#FFFFFF" // rgb: 0, 0, 0
taste_description = "rice"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/vanilla
name = "Vanilla Powder"
@@ -567,6 +594,7 @@
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#FFFACD"
taste_description = "vanilla"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/eggyolk
name = "Egg Yolk"
@@ -574,6 +602,7 @@
nutriment_factor = 3 * REAGENTS_METABOLISM
color = "#FFB500"
taste_description = "egg"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/corn_starch
name = "Corn Starch"
@@ -587,6 +616,7 @@
color = "#DBCE95"
metabolization_rate = 3 * REAGENTS_METABOLISM
taste_description = "sweet slime"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/carbon/M)
holder.add_reagent(/datum/reagent/consumable/sugar, 3)
@@ -599,6 +629,7 @@
nutriment_factor = 15 * REAGENTS_METABOLISM
metabolization_rate = 1 * REAGENTS_METABOLISM
taste_description = "sweetness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
// On the other hand, honey has been known to carry pollen with it rarely. Can be used to take in a lot of plant qualities all at once, or harm the plant.
/datum/reagent/consumable/honey/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -634,12 +665,14 @@
description = "A white and oily mixture of mixed egg yolks."
color = "#DFDFDF"
taste_description = "mayonnaise"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/mold // yeah, ok, togopal, I guess you could call that a condiment
name = "Mold"
description = "This condiment will make any food break the mold. Or your stomach."
color ="#708a88"
taste_description = "rancid fungus"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/tearjuice
name = "Tear Juice"
@@ -647,6 +680,7 @@
color = "#c0c9a0"
taste_description = "bitterness"
ph = 5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/tearjuice/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)
. = ..()
@@ -676,6 +710,7 @@
reagent_state = SOLID
nutriment_factor = 15 * REAGENTS_METABOLISM
color = "#664330" // rgb: 102, 67, 48
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/carbon/M)
if(M.nutrition > NUTRITION_LEVEL_FULL - 25)
@@ -691,6 +726,7 @@
color = "#1d043d"
taste_description = "bitter mushroom"
ph = 12
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/entpoly/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 10)
@@ -712,6 +748,7 @@
color = "#b5a213"
taste_description = "tingling mushroom"
ph = 11.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
//Lazy list of mobs affected by the luminosity of this reagent.
var/list/mobs_affected
@@ -746,6 +783,7 @@
nutriment_factor = 3 * REAGENTS_METABOLISM
taste_description = "fruity mushroom"
ph = 10.4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/vitfro/on_mob_life(mob/living/carbon/M)
if(prob(80))
@@ -761,6 +799,7 @@
color = "#eef442" // rgb: 238, 244, 66
taste_description = "mournful honking"
ph = 9.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/liquidelectricity
@@ -769,6 +808,7 @@
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#97ee63"
taste_description = "pure electricity"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/liquidelectricity/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) //can't be on life because of the way blood works.
. = ..()
@@ -796,6 +836,7 @@
taste_mult = 8
taste_description = "sweetness"
overdose_threshold = 17
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/astrotame/overdose_process(mob/living/carbon/M)
if(M.disgust < 80)
@@ -811,7 +852,6 @@
taste_description = "indescribable"
quality = FOOD_AMAZING
taste_mult = 100
can_synth = FALSE
ph = 6.1
/datum/reagent/consumable/nutriment/peptides
@@ -822,6 +862,7 @@
nutriment_factor = 10 * REAGENTS_METABOLISM // 33% less than nutriment to reduce weight gain
brute_heal = 3
burn_heal = 1
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/caramel
name = "Caramel"
@@ -831,6 +872,7 @@
taste_mult = 2
taste_description = "caramel"
reagent_state = SOLID
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/char
name = "Char"
@@ -841,6 +883,7 @@
taste_mult = 6
taste_description = "smoke"
overdose_threshold = 15
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/char/overdose_process(mob/living/M)
if(prob(25))
@@ -855,6 +898,7 @@
color = "#78280A" // rgb: 120 40, 10
taste_mult = 2.5 //sugar's 1.5, capsacin's 1.5, so a good middle ground.
taste_description = "smokey sweetness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/chocolatepudding
name = "Chocolate Pudding"
@@ -866,6 +910,7 @@
glass_icon_state = "chocolatepudding"
glass_name = "chocolate pudding"
glass_desc = "Tasty."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/vanillapudding
name = "Vanilla Pudding"
@@ -877,6 +922,7 @@
glass_icon_state = "vanillapudding"
glass_name = "vanilla pudding"
glass_desc = "Tasty."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/laughsyrup
name = "Laughin' Syrup"
@@ -885,6 +931,7 @@
nutriment_factor = 5 * REAGENTS_METABOLISM
taste_mult = 2
taste_description = "fizzy sweetness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/gravy
name = "Gravy"
@@ -892,9 +939,11 @@
taste_description = "gravy"
color = "#623301"
taste_mult = 1.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/pancakebatter
name = "pancake batter"
description = "A very milky batter. 5 units of this on the griddle makes a mean pancake."
taste_description = "milky batter"
color = "#fccc98"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED

2
code/modules/reagents/chemistry/reagents/impure_reagents.dm
View File

@@ -7,7 +7,7 @@
name = "Chemical Isomers"
description = "Impure chemical isomers made from inoptimal reactions. Causes mild liver damage"
//by default, it will stay hidden on splitting, but take the name of the source on inverting. Cannot be fractioned down either if the reagent is somehow isolated.
chemical_flags = REAGENT_INVISIBLE | REAGENT_SNEAKYNAME | REAGENT_DONOTSPLIT
chemical_flags = REAGENT_INVISIBLE | REAGENT_SNEAKYNAME | REAGENT_DONOTSPLIT | REAGENT_CAN_BE_SYNTHESIZED
ph = 3
overdose_threshold = 0 //So that they're shown as a problem (?)

50
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
View File

@@ -21,6 +21,7 @@
description = "Leporazine will effectively regulate a patient's body temperature, ensuring it never leaves safe levels."
ph = 8.4
color = "#DB90C6"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/M)
if(M.bodytemperature > M.get_body_temp_normal(apply_change=FALSE))
@@ -39,7 +40,6 @@
name = "Adminordrazine"
description = "It's magic. We don't have to explain it."
color = "#E0BB00" //golden for the gods
can_synth = FALSE
taste_description = "badmins"
// The best stuff there is. For testing/debugging.
@@ -111,6 +111,7 @@
description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations."
color = "#FF00FF"
ph = 4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(M.drowsyness-5, 0)
@@ -132,6 +133,7 @@
description = "Reduces drowsiness, hallucinations, and Histamine from body."
color = "#EC536D" // rgb: 236, 83, 109
ph = 5.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(M.drowsyness-5, 0)
@@ -151,6 +153,7 @@
color = "#0000C8"
taste_description = "blue"
ph = 11
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/M)
var/power = -0.00003 * (M.bodytemperature ** 2) + 3
@@ -196,6 +199,7 @@
color = "#f7832a"
taste_description = "spicy jelly"
ph = 12
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/carbon/M)
if(M.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
@@ -230,6 +234,7 @@
overdose_threshold = 30
ph = 12.2
taste_description = "fish"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/rezadone/on_mob_life(mob/living/carbon/M)
M.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that.
@@ -261,6 +266,7 @@
color = "#E1F2E6"
metabolization_rate = 0.1 * REAGENTS_METABOLISM
ph = 8.1
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
//Goon Chems. Ported mainly from Goonstation. Easily mixable (or not so easily) and provide a variety of effects.
@@ -272,6 +278,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
overdose_threshold = 25
ph = 10.7
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/carbon/M)
if(M.getFireLoss() > 25)
@@ -299,6 +306,7 @@
var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10 //So that normal blood regeneration can continue with salglu active
var/extra_regen = 0.25 // in addition to acting as temporary blood, also add this much to their actual blood per tick
ph = 5.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/M)
if(last_added)
@@ -337,6 +345,7 @@
color = "#6D6374"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
ph = 2.6
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/C)
C.hal_screwyhud = SCREWYHUD_HEALTHY
@@ -379,6 +388,7 @@
overdose_threshold = 30
var/healing = 0.5
ph = 2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/omnizine/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(-healing*REM, 0)
@@ -401,6 +411,7 @@
description = "A less environmentally friendly and somewhat weaker variant of omnizine."
color = "#d8c7b7"
healing = 0.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/calomel
name = "Calomel"
@@ -410,6 +421,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "acid"
ph = 1.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/M)
for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
@@ -426,6 +438,7 @@
color = "#BAA15D"
metabolization_rate = 2 * REAGENTS_METABOLISM
ph = 12 //It's a reducing agent
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/M)
if(M.radiation > 0)
@@ -439,6 +452,7 @@
color = "#E6FFF0"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
ph = 1 //One of the best buffers, NEVERMIND!
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/M)
M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/50
@@ -457,6 +471,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
overdose_threshold = 25
ph = 2.1
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() > 25)
@@ -479,6 +494,7 @@
color = "#00FFFF"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
ph = 2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/carbon/M)
M.adjustOxyLoss(-3*REM, 0)
@@ -496,6 +512,7 @@
overdose_threshold = 30
addiction_threshold = 25
ph = 12
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/ephedrine/on_mob_metabolize(mob/living/L)
..()
@@ -590,6 +607,7 @@
color = "#64FFE6"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
ph = 11.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/M)
if(prob(10))
@@ -607,6 +625,7 @@
overdose_threshold = 30
addiction_threshold = 25
ph = 8.96
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/morphine/on_mob_metabolize(mob/living/L)
..()
@@ -677,6 +696,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
taste_description = "dull toxin"
ph = 10
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/oculine/on_mob_life(mob/living/carbon/M)
var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
@@ -702,6 +722,7 @@
description = "Rapidly repairs damage to the patient's ears to cure deafness, assuming the source of said deafness isn't from genetic mutations, chronic deafness, or a total defecit of ears." //by "chronic" deafness, we mean people with the "deaf" quirk
color = "#606060" // ditto
ph = 2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/M)
var/obj/item/organ/ears/ears = M.getorganslot(ORGAN_SLOT_EARS)
@@ -716,6 +737,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 35
ph = 12
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/M)
if(M.health <= M.crit_threshold)
@@ -745,6 +767,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 30
ph = 10.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/epinephrine/on_mob_metabolize(mob/living/carbon/M)
..()
@@ -794,6 +817,7 @@
taste_description = "magnets"
harmful = TRUE
ph = 0.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
// FEED ME SEYMOUR
@@ -836,6 +860,7 @@
description = "Efficiently restores brain damage."
color = "#A0A0A0" //mannitol is light grey, neurine is lighter grey
ph = 10.4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/C)
C.adjustOrganLoss(ORGAN_SLOT_BRAIN, -2*REM)
@@ -854,6 +879,7 @@
name = "Neurine"
description = "Reacts with neural tissue, helping reform damaged connections. Can cure minor traumas."
color = "#C0C0C0" //ditto
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/C)
if(holder.has_reagent(/datum/reagent/consumable/ethanol/neurotoxin))
@@ -868,6 +894,7 @@
color = "#5096C8"
taste_description = "acid"
ph = 2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/M)
M.jitteriness = 0
@@ -882,6 +909,7 @@
color = "#00B4C8"
taste_description = "raw egg"
ph = 4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/antihol/on_mob_life(mob/living/carbon/M)
M.dizziness = 0
@@ -903,6 +931,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
overdose_threshold = 60
ph = 8.7
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/stimulants/on_mob_metabolize(mob/living/L)
..()
@@ -940,6 +969,7 @@
color = "#FFFFF0"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
ph = 6.7
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/M)
if(M.AdjustSleeping(-20))
@@ -955,6 +985,7 @@
reagent_state = LIQUID
color = "#A4D8D8"
ph = 8.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/M)
if(M.losebreath >= 5)
@@ -967,6 +998,7 @@
reagent_state = LIQUID
color = "#CC23FF"
taste_description = "jelly"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/regen_jelly/expose_mob(mob/living/exposed_mob, reac_volume)
. = ..()
@@ -993,6 +1025,7 @@
color = "#555555"
overdose_threshold = 30
ph = 11
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-5*REM, 0) //A ton of healing - this is a 50 telecrystal investment.
@@ -1018,6 +1051,7 @@
metabolization_rate = 0.4 //Math is based on specific metab rate so we want this to be static AKA if define or medicine metab rate changes, we want this to stay until we can rework calculations.
overdose_threshold = 25
ph = 11
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/carbon/M)
if(current_cycle <= 25) //10u has to be processed before u get into THE FUN ZONE
@@ -1070,6 +1104,7 @@
color = "#27870a"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
ph = 4.3
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/carbon/M)
for(var/datum/reagent/drug/R in M.reagents.reagent_list)
@@ -1091,6 +1126,7 @@
description = "Reduces the duration of unconciousness, knockdown and stuns. Restores stamina, but deals toxin damage when overdosed."
color = "#C1151D"
overdose_threshold = 30
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/M as mob)
..()
@@ -1124,6 +1160,7 @@
description = "Drastically increases movement speed, but deals toxin damage."
color = "#AE151D"
metabolization_rate = 1
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/changelinghaste/on_mob_metabolize(mob/living/L)
..()
@@ -1143,6 +1180,7 @@
description = "A medication utilized to treat ailing livers."
color = "#FF3542"
self_consuming = TRUE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/higadrite/on_mob_metabolize(mob/living/M)
. = ..()
@@ -1157,6 +1195,7 @@
description = "A strange, pitch-black reagent that seems to absorb all light. Effects unknown."
color = "#000000"
self_consuming = TRUE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/cordiolis_hepatico/on_mob_add(mob/living/M)
..()
@@ -1171,6 +1210,7 @@
/datum/reagent/medicine/muscle_stimulant
name = "Muscle Stimulant"
description = "A potent chemical that allows someone under its influence to be at full physical ability even when under massive amounts of pain."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/muscle_stimulant/on_mob_metabolize(mob/living/L)
. = ..()
@@ -1190,6 +1230,7 @@
taste_description = "salt" // it actually does taste salty
var/overdose_progress = 0 // to track overdose progress
ph = 7.89
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/modafinil/on_mob_metabolize(mob/living/M)
ADD_TRAIT(M, TRAIT_SLEEPIMMUNE, type)
@@ -1253,6 +1294,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 30
ph = 9.12
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/psicodine/on_mob_metabolize(mob/living/L)
..()
@@ -1286,6 +1328,7 @@
reagent_state = SOLID
color = "#FFBE00"
overdose_threshold = 10
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/metafactor/overdose_start(mob/living/carbon/M)
metabolization_rate = 2 * REAGENTS_METABOLISM
@@ -1301,6 +1344,7 @@
reagent_state = SOLID
color = "#FFFFD0"
metabolization_rate = 1.5 * REAGENTS_METABOLISM
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/silibinin/on_mob_life(mob/living/carbon/M)
M.adjustOrganLoss(ORGAN_SLOT_LIVER, -2)//Add a chance to cure liver trauma once implemented.
@@ -1315,6 +1359,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 50
taste_description = "numbing bitterness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/polypyr/on_mob_life(mob/living/carbon/M) //I wanted a collection of small positive effects, this is as hard to obtain as coniine after all.
. = ..()
@@ -1342,6 +1387,7 @@
reagent_state = LIQUID
overdose_threshold = 50
metabolization_rate = 0.2 //same as C2s
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/granibitaluri/on_mob_life(mob/living/carbon/M)
var/healamount = min(-0.5 + round(0.01 * (M.getBruteLoss() + M.getFireLoss()), 0.1), 0) //base of 0.5 healing per cycle and loses 0.1 healing for every 10 combined brute/burn damage you have
@@ -1370,6 +1416,7 @@
var/passive_bleed_modifier = 0.7
/// For tracking when we tell the person we're no longer bleeding
var/was_working
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/medicine/coagulant/on_mob_metabolize(mob/living/M)
ADD_TRAIT(M, TRAIT_COAGULATING, /datum/reagent/medicine/coagulant)
@@ -1448,3 +1495,4 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
clot_rate = 0.2
passive_bleed_modifier = 0.8
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED

168
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

File diff suppressed because it is too large Load Diff

19
code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
View File

@@ -3,6 +3,7 @@
name = "Thermite"
description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls."
reagent_state = SOLID
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
color = "#550000"
taste_description = "sweet tasting metal"
@@ -21,6 +22,7 @@
description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol."
color = "#808080" // rgb: 128, 128, 128
taste_description = "oil"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/stabilizing_agent
name = "Stabilizing Agent"
@@ -28,6 +30,7 @@
reagent_state = LIQUID
color = "#FFFF00"
taste_description = "metal"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
//It has stable IN THE NAME. IT WAS MADE FOR THIS MOMENT.
/datum/reagent/stabilizing_agent/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -43,6 +46,7 @@
metabolization_rate = 4
taste_description = "burning"
penetrates_skin = NONE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/clf3/on_mob_life(mob/living/carbon/M)
M.adjust_fire_stacks(2)
@@ -81,6 +85,7 @@
reagent_state = LIQUID
color = "#5A64C8"
taste_description = "air and bitterness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/liquid_dark_matter
name = "Liquid Dark Matter"
@@ -88,6 +93,7 @@
reagent_state = LIQUID
color = "#210021"
taste_description = "compressed bitterness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/gunpowder
name = "Gunpowder"
@@ -96,6 +102,7 @@
color = "#000000"
metabolization_rate = 0.05
taste_description = "salt"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/gunpowder/on_mob_life(mob/living/carbon/M)
. = TRUE
@@ -119,6 +126,7 @@
reagent_state = SOLID
color = "#FFFFFF"
taste_description = "salt"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/tatp
name = "TaTP"
@@ -126,6 +134,7 @@
reagent_state = SOLID
color = "#FFFFFF"
taste_description = "death"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/flash_powder
name = "Flash Powder"
@@ -133,6 +142,7 @@
reagent_state = LIQUID
color = "#C8C8C8"
taste_description = "salt"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/smoke_powder
name = "Smoke Powder"
@@ -140,6 +150,7 @@
reagent_state = LIQUID
color = "#C8C8C8"
taste_description = "smoke"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/sonic_powder
name = "Sonic Powder"
@@ -147,6 +158,7 @@
reagent_state = LIQUID
color = "#C8C8C8"
taste_description = "loud noises"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/phlogiston
name = "Phlogiston"
@@ -155,6 +167,7 @@
color = "#FA00AF"
taste_description = "burning"
self_consuming = TRUE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/phlogiston/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)
. = ..()
@@ -178,6 +191,7 @@
taste_description = "burning"
self_consuming = TRUE
penetrates_skin = NONE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
// why, just why
/datum/reagent/napalm/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -204,6 +218,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "bitterness"
self_consuming = TRUE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/cryostylane/on_mob_life(mob/living/carbon/M) //TODO: code freezing into an ice cube
@@ -229,6 +244,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "bitterness"
self_consuming = TRUE
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/pyrosium/on_mob_life(mob/living/carbon/M)
if(holder.has_reagent(/datum/reagent/oxygen))
@@ -248,6 +264,7 @@
taste_description = "charged metal"
self_consuming = TRUE
var/shock_timer = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/teslium/on_mob_life(mob/living/carbon/M)
shock_timer++
@@ -275,6 +292,7 @@
reagent_state = LIQUID
color = "#CAFF43"
taste_description = "jelly"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/teslium/energized_jelly/on_mob_life(mob/living/carbon/M)
if(isjellyperson(M))
@@ -293,6 +311,7 @@
reagent_state = LIQUID
color = "#A6FAFF55"
taste_description = "the inside of a fire extinguisher"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/firefighting_foam/expose_turf(turf/open/exposed_turf, reac_volume)
. = ..()

52
code/modules/reagents/chemistry/reagents/toxin_reagents.dm
View File

@@ -9,6 +9,7 @@
taste_mult = 1.2
harmful = TRUE
var/toxpwr = 1.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
var/silent_toxin = FALSE //won't produce a pain message when processed by liver/life() if there isn't another non-silent toxin present.
// Are you a bad enough dude to poison your own plants?
@@ -30,6 +31,7 @@
toxpwr = 2.5
taste_description = "mushroom"
ph = 13
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/mutagen
name = "Unstable mutagen"
@@ -39,6 +41,7 @@
taste_description = "slime"
taste_mult = 0.9
ph = 2.3
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/mutagen/expose_mob(mob/living/carbon/exposed_mob, methods=TOUCH, reac_volume)
. = ..()
@@ -75,6 +78,7 @@
material = /datum/material/plasma
penetrates_skin = NONE
ph = 4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/plasma/on_new(data)
. = ..()
@@ -125,6 +129,7 @@
specific_heat = SPECIFIC_HEAT_PLASMA
toxpwr = 3
material = /datum/material/hot_ice
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/hot_ice/on_mob_life(mob/living/carbon/M)
if(holder.has_reagent(/datum/reagent/medicine/epinephrine))
@@ -143,6 +148,7 @@
toxpwr = 0
taste_description = "acid"
ph = 1.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/lexorin/on_mob_life(mob/living/carbon/C)
. = TRUE
@@ -165,6 +171,7 @@
taste_description = "slime"
taste_mult = 1.3
ph = 10
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/carbon/M)
if(prob(10))
@@ -183,6 +190,7 @@
toxpwr = 0
taste_description = "mint"
ph = 8
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/carbon/M)
if(HAS_TRAIT(M, TRAIT_FAT))
@@ -197,6 +205,7 @@
toxpwr = 2
taste_description = "fish"
ph = 12
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/carpotoxin/on_mob_life(mob/living/carbon/M)
. = ..()
@@ -214,6 +223,7 @@
penetrates_skin = NONE
var/fakedeath_active = FALSE
ph = 13
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/zombiepowder/on_mob_metabolize(mob/living/L)
..()
@@ -256,6 +266,7 @@
toxpwr = 0.8
taste_description = "death"
ph = 14.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/ghoulpowder/on_mob_metabolize(mob/living/L)
..()
@@ -277,6 +288,7 @@
toxpwr = 0
taste_description = "sourness"
ph = 11
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/carbon/M)
M.hallucination += 5
@@ -290,6 +302,7 @@
taste_mult = 1
penetrates_skin = NONE
ph = 2.7
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
// Plant-B-Gone is just as bad
/datum/reagent/toxin/plantbgone/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -323,6 +336,7 @@
description = "A harmful toxic mixture to kill weeds. Do not ingest!"
color = "#4B004B" // rgb: 75, 0, 75
ph = 3
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
//Weed Spray
/datum/reagent/toxin/plantbgone/weedkiller/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -338,6 +352,7 @@
color = "#4B004B" // rgb: 75, 0, 75
toxpwr = 1
ph = 3.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
//Pest Spray
/datum/reagent/toxin/pestkiller/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -358,6 +373,7 @@
description = "An organic mixture used to kill pests, with less of the side effects. Do not ingest!"
color = "#4b2400" // rgb: 75, 0, 75
toxpwr = 1
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
//Pest Spray
/datum/reagent/toxin/pestkiller/organic/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -373,6 +389,7 @@
color = "#9ACD32"
toxpwr = 1
ph = 11
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/spore/on_mob_life(mob/living/carbon/C)
C.damageoverlaytemp = 60
@@ -387,6 +404,7 @@
toxpwr = 0.5
taste_description = "burning"
ph = 13
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/spore_burning/on_mob_life(mob/living/carbon/M)
M.adjust_fire_stacks(2)
@@ -402,6 +420,7 @@
toxpwr = 0
metabolization_rate = 1.5 * REAGENTS_METABOLISM
ph = 11
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/carbon/M)
switch(current_cycle)
@@ -427,6 +446,7 @@
glass_name = "glass of beer"
glass_desc = "A freezing pint of beer."
ph = 2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/fakebeer/on_mob_life(mob/living/carbon/M)
switch(current_cycle)
@@ -444,6 +464,7 @@
color = "#5B2E0D" // rgb: 91, 46, 13
toxpwr = 0.5
ph = 4.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/teapowder
name = "Ground Tea Leaves"
@@ -453,6 +474,7 @@
toxpwr = 0.1
taste_description = "green tea"
ph = 4.9
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/mutetoxin //the new zombie powder.
name = "Mute Toxin"
@@ -462,6 +484,7 @@
toxpwr = 0
taste_description = "silence"
ph = 12.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/mutetoxin/on_mob_life(mob/living/carbon/M)
M.silent = max(M.silent, 3)
@@ -474,6 +497,7 @@
color = "#6E2828"
data = 13
toxpwr = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/M)
M.adjustStaminaLoss(REM * data, 0)
@@ -488,6 +512,7 @@
color = "#787878"
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/polonium/on_mob_life(mob/living/carbon/M)
M.radiation += 4
@@ -502,6 +527,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 30
toxpwr = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/histamine/on_mob_life(mob/living/carbon/M)
if(prob(50))
@@ -535,6 +561,7 @@
color = "#B4004B"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 1
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/carbon/M)
if(prob(5))
@@ -550,6 +577,7 @@
color = "#F0FFF0"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
toxpwr = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/venom/on_mob_life(mob/living/carbon/M)
toxpwr = 0.2*volume
@@ -568,6 +596,7 @@
color = "#64916E"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/carbon/M)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3*REM, 150)
@@ -587,6 +616,7 @@
color = "#00B4FF"
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 1.25
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/cyanide/on_mob_life(mob/living/carbon/M)
if(prob(5))
@@ -605,6 +635,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
toxpwr = 0.5
taste_description = "bad cooking"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/itching_powder
name = "Itching Powder"
@@ -615,6 +646,7 @@
metabolization_rate = 0.4 * REAGENTS_METABOLISM
toxpwr = 0
penetrates_skin = TOUCH|VAPOR
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/M)
if(prob(15))
@@ -643,6 +675,7 @@
color = "#7F10C0"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 2.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/initropidril/on_mob_life(mob/living/carbon/C)
if(prob(25))
@@ -675,6 +708,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
toxpwr = 0
taste_mult = 0 // undetectable, I guess?
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/pancuronium/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 10)
@@ -692,6 +726,7 @@
color = "#6496FA"
metabolization_rate = 0.75 * REAGENTS_METABOLISM
toxpwr = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 10)
@@ -708,6 +743,7 @@
color = "#7DC3A0"
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 0.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 22)
@@ -722,6 +758,7 @@
color = "#FFFFFF"
toxpwr = 0
metabolization_rate = 0.5 * REAGENTS_METABOLISM
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/amanitin/on_mob_delete(mob/living/M)
var/toxdamage = current_cycle*3*REM
@@ -738,6 +775,7 @@
color = "#F0FFF0"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
@@ -753,6 +791,7 @@
color = "#7DC3A0"
metabolization_rate = 0.06 * REAGENTS_METABOLISM
toxpwr = 1.75
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/coniine/on_mob_life(mob/living/carbon/M)
M.losebreath += 5
@@ -767,6 +806,7 @@
overdose_threshold = 29
toxpwr = 0
taste_description = "vomit"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/spewium/on_mob_life(mob/living/carbon/C)
.=..()
@@ -790,6 +830,7 @@
color = "#191919"
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 1
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/curare/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 11)
@@ -806,6 +847,7 @@
color = "#C8C8C8" //RGB: 200, 200, 200
metabolization_rate = 0.2 * REAGENTS_METABOLISM
toxpwr = 0
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/heparin/on_mob_metabolize(mob/living/M)
ADD_TRAIT(M, TRAIT_BLOODY_MESS, /datum/reagent/toxin/heparin)
@@ -824,6 +866,7 @@
metabolization_rate = 0.6 * REAGENTS_METABOLISM
toxpwr = 0.5
taste_description = "spinning"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/M)
if(M.hud_used)
@@ -850,6 +893,7 @@
color = "#3C5133"
metabolization_rate = 0.08 * REAGENTS_METABOLISM
toxpwr = 0.15
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/anacea/on_mob_life(mob/living/carbon/M)
var/remove_amt = 5
@@ -871,6 +915,7 @@
taste_description = "acid"
self_consuming = TRUE
ph = 2.75
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
// ...Why? I mean, clearly someone had to have done this and thought, well, acid doesn't hurt plants, but what brought us here, to this point?
/datum/reagent/toxin/acid/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -914,6 +959,7 @@
toxpwr = 2
acidpwr = 42.0
ph = 1.3
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
// SERIOUSLY
/datum/reagent/toxin/acid/fluacid/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -935,6 +981,7 @@
toxpwr = 3
acidpwr = 5.0
ph = 3.3
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/acid/nitracid/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(volume/10, FALSE) //here you go nervar
@@ -950,6 +997,7 @@
toxpwr = 0
var/actual_toxpwr = 5
var/delay = 30
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/delayed/on_mob_life(mob/living/carbon/M)
if(current_cycle > delay)
@@ -967,6 +1015,7 @@
color = "#F0F8FF" // rgb: 240, 248, 255
toxpwr = 0
taste_description = "stillness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/mimesbane/on_mob_metabolize(mob/living/L)
ADD_TRAIT(L, TRAIT_EMOTEMUTE, type)
@@ -982,6 +1031,7 @@
toxpwr = 0
taste_description = "bone hurting"
overdose_threshold = 50
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/bonehurtingjuice/on_mob_add(mob/living/carbon/M)
M.say("oof ouch my bones", forced = /datum/reagent/toxin/bonehurtingjuice)
@@ -1021,6 +1071,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 0
taste_description = "tannin"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/bungotoxin/on_mob_life(mob/living/carbon/M)
M.adjustOrganLoss(ORGAN_SLOT_HEART, 3)
@@ -1039,6 +1090,7 @@
toxpwr = 0.5
taste_mult = 1.3
taste_description = "sugary sweetness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/leadacetate/on_mob_life(mob/living/carbon/M)
M.adjustOrganLoss(ORGAN_SLOT_EARS,1)

2
code/modules/reagents/chemistry/recipes/special.dm
View File

@@ -25,7 +25,7 @@ GLOBAL_LIST_INIT(medicine_reagents, build_medicine_reagents())
for(var/A in subtypesof(/datum/reagent/medicine))
var/datum/reagent/R = A
if(initial(R.can_synth))
if(initial(R.chemical_flags) & REAGENT_CAN_BE_SYNTHESIZED)
. += R
#define RNGCHEM_INPUT "input"

2
code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
View File

@@ -469,7 +469,7 @@
return FALSE
to_chat(user, "[icon2html(src, user)]<span class='notice'>Analyzing reagents...</span>")
for(var/datum/reagent/R in A.reagents.reagent_list)
if(R.can_synth && add_known_reagent(R.type,R.name))
if((R.chemical_flags & REAGENT_CAN_BE_SYNTHESIZED) && add_known_reagent(R.type,R.name))
to_chat(user, "[icon2html(src, user)]<span class='notice'>Reagent analyzed, identified as [R.name] and added to database.</span>")
send_byjax(chassis.occupants,"msyringegun.browser","reagents_form",get_reagents_form())
to_chat(user, "[icon2html(src, user)]<span class='notice'>Analysis complete.</span>")

2
modular_skyrat/modules/biohazard_blob/code/biohazard_blob_disease.dm
View File

@@ -58,7 +58,7 @@
name = "Cordycep bacillus microbes"
description = "Active fungal spores."
color = "#92D17D"
can_synth = FALSE
chemical_flags = NONE
taste_description = "slime"
penetrates_skin = NONE