cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove extraneous reagent istype checks, allow carbons (MONKEYS) to get drunk (#38831)

Browse Source 
* reaction_mob

* on_mob_add

* on_mob_life

* allow carbons to get drunk
This commit is contained in:
vuonojenmustaturska
2018-07-02 19:27:50 +03:00
committed by yogstation13-bot
parent 98356cd628
commit d4bc8e4561
16 changed files with 480 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/reagents/chemistry/readme.md
View File

@@ -38,7 +38,7 @@ The holder (reagents datum) is the datum that holds a list of all reagents curre
If the specified amount is greater than what is available, it will use
the amount of the reagent that is available. If no reagent exists, returns null.
metabolize(var/mob/M)
metabolize(var/mob/living/carbon/C)
This proc is called by the mobs life proc. It simply calls on_mob_life for
all contained reagents. You shouldnt have to use this one directly.
@@ -116,7 +116,7 @@ The holder (reagents datum) is the datum that holds a list of all reagents curre
# About Reagents:
Reagents are all the things you can mix and fille in bottles etc. This can be anything from rejuvs over water to ... iron. Each reagent also has a few procs - i'll explain those below.
```
reaction_mob(var/mob/M, var/method=TOUCH)
reaction_mob(var/mob/living/L, var/method=TOUCH)
This is called by the holder's reation proc.
This version is only called when the reagent
reacts with a mob. The method var can be either
@@ -135,7 +135,7 @@ Reagents are all the things you can mix and fille in bottles etc. This can be an
with a turf. You'll want to put stuff like extra
slippery floors for lube or something in here.
on_mob_life(var/mob/M)
on_mob_life(var/mob/living/L)
This proc is called everytime the mobs life proc executes.
This is the place where you put damage for toxins ,
drowsyness for sleep toxins etc etc.
@@ -241,7 +241,7 @@ By default, all atom have a reagents var - but its empty. if you want to use an
Checks if something can be injected to.
If this returns 1, you can use syringes and droppers
to draw from and add to the contents of this object.
atom/proc/is_drawable()
Checks if something can be drawn from.
If this returns 1, you can use syringes and droppers
@@ -255,4 +255,4 @@ Credit goes to Cogwerks, and all the other goonstation coders for the original i
- Any of the Secret Chems
- Goon in-joke chems (Eg. Cat Drugs, Hairgrownium)
- Liquid Electricity
- Rajajajah
- Rajajajah

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

@@ -51,17 +51,17 @@
/datum/reagent/proc/reaction_turf(turf/T, volume)
return
/datum/reagent/proc/on_mob_life(mob/living/M)
/datum/reagent/proc/on_mob_life(mob/living/carbon/M)
current_cycle++
holder.remove_reagent(src.id, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
return
// Called when this reagent is first added to a mob
/datum/reagent/proc/on_mob_add(mob/M)
/datum/reagent/proc/on_mob_add(mob/living/L)
return
// Called when this reagent is removed while inside a mob
/datum/reagent/proc/on_mob_delete(mob/M)
/datum/reagent/proc/on_mob_delete(mob/living/L)
return
/datum/reagent/proc/on_move(mob/M)

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

@@ -34,17 +34,16 @@ All effects don't start immediately, but rather get worse over time; the rate is
91-100: Dangerously toxic - swift death
*/
/datum/reagent/consumable/ethanol/on_mob_life(mob/living/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
var/booze_power = boozepwr
if(H.has_trait(TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker
booze_power *= 0.7
H.drunkenness = max((H.drunkenness + (sqrt(volume) * booze_power * ALCOHOL_RATE)), 0) //Volume, power, and server alcohol rate effect how quickly one gets drunk
var/obj/item/organ/liver/L = H.getorganslot(ORGAN_SLOT_LIVER)
H.applyLiverDamage((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * L.alcohol_tolerance, 0))/150)
return ..() || .
/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/C)
if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
var/booze_power = boozepwr
if(C.has_trait(TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker
booze_power *= 0.7
C.drunkenness = max((C.drunkenness + (sqrt(volume) * booze_power * ALCOHOL_RATE)), 0) //Volume, power, and server alcohol rate effect how quickly one gets drunk
var/obj/item/organ/liver/L = C.getorganslot(ORGAN_SLOT_LIVER)
if (istype(L))
C.applyLiverDamage((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * L.alcohol_tolerance, 0))/150)
return ..()
/datum/reagent/consumable/ethanol/reaction_obj(obj/O, reac_volume)
if(istype(O, /obj/item/paper))
@@ -107,7 +106,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."
/datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/carbon/M)
if(M.color != color)
M.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY)
return ..()
@@ -126,7 +125,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"
/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40, FALSE)
@@ -161,7 +160,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
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."
/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-7)
M.AdjustSleeping(-40)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -222,7 +221,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"
/datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/carbon/M)
M.radiation = max(M.radiation-2,0)
return ..()
@@ -238,7 +237,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of bilk"
glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() && prob(10))
M.heal_bodypart_damage(1)
. = 1
@@ -255,7 +254,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."
/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/carbon/M)
M.set_drugginess(50)
return ..()
@@ -361,7 +360,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "It's as strong as it smells."
shot_glass_icon_state = "shotglassgreen"
/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/M)
if(prob(10) && !M.has_trait(TRAIT_ALCOHOL_TOLERANCE))
M.hallucination += 4 //Reference to the urban myth
..()
@@ -446,7 +445,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Cuba Libre"
glass_desc = "A classic mix of rum, cola, and lime. A favorite of revolutionaries everywhere!"
/datum/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/M)
/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.
M.adjustBruteLoss(-1, 0)
M.adjustFireLoss(-1, 0)
@@ -510,7 +509,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Screwdriver"
glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
/datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_life(mob/living/carbon/M)
if(M.mind && M.mind.assigned_role in list("Station Engineer", "Atmospheric Technician", "Chief Engineer")) //Engineers lose radiation poisoning at a massive rate.
M.radiation = max(M.radiation - 25, 0)
return ..()
@@ -537,11 +536,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Bloody Mary"
glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
/datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/M)
if(iscarbon(M))
var/mob/living/carbon/C = M
if(C.blood_volume < BLOOD_VOLUME_NORMAL)
C.blood_volume = min(BLOOD_VOLUME_NORMAL, C.blood_volume + 3) //Bloody Mary quickly restores blood loss.
/datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/C)
if(C.blood_volume < BLOOD_VOLUME_NORMAL)
C.blood_volume = min(BLOOD_VOLUME_NORMAL, C.blood_volume + 3) //Bloody Mary quickly restores blood loss.
..()
/datum/reagent/consumable/ethanol/brave_bull
@@ -584,7 +581,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
light_holder = new(M)
light_holder.set_light(3, 0.7, "#FFCC00") //Tequila Sunrise makes you radiate dim light, like a sunrise!
/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_life(mob/living/carbon/M)
if(QDELETED(light_holder))
M.reagents.del_reagent("tequilasunrise") //If we lost our light object somehow, remove the reagent
else if(light_holder.loc != M)
@@ -607,7 +604,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Whoah, this thing is on FIRE!"
shot_glass_icon_state = "toxinsspecialglass"
/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(var/mob/living/M as mob)
/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(var/mob/living/M)
M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL + 20) //310.15 is the normal bodytemp.
return ..()
@@ -623,7 +620,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Beepsky Smash"
glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/carbon/M)
if(M.has_trait(TRAIT_ALCOHOL_TOLERANCE))
M.Stun(30, 0) //this realistically does nothing to prevent chainstunning but will cause them to recover faster once it's out of their system
else
@@ -661,7 +658,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
boozepwr = 5 //We've had worse in the mines
dorf_mode = TRUE
/datum/reagent/consumable/ethanol/manly_dorf/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/manly_dorf/on_mob_life(mob/living/carbon/M)
if(dorf_mode)
M.adjustBruteLoss(-2)
M.adjustFireLoss(-2)
@@ -763,7 +760,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "A scientist's drink of choice, for thinking how to blow up the station."
/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/M)
M.set_drugginess(30)
return ..()
@@ -789,7 +786,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Anti-freeze"
glass_desc = "The ultimate refreshment."
/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(20 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL + 20) //310.15 is the normal bodytemp.
return ..()
@@ -804,7 +801,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Barefoot"
glass_desc = "Barefoot and pregnant."
/datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/M)
/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.
var/mob/living/carbon/human/H = M
if(!H.shoes)
@@ -902,7 +899,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Sbiten"
glass_desc = "A spicy mix of Vodka and Spice. Very hot."
/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/M)
/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.
return ..()
@@ -940,7 +937,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "iced beer"
glass_desc = "A beer so frosty, the air around it freezes."
/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/M)
/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.
return ..()
@@ -1022,7 +1019,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Changeling Sting"
glass_desc = "A stingy drink."
/datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/carbon/M)
if(M.mind) //Changeling Sting assists in the recharging of changeling chemicals.
var/datum/antagonist/changeling/changeling = M.mind.has_antag_datum(/datum/antagonist/changeling)
if(changeling)
@@ -1052,7 +1049,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Syndicate Bomb"
glass_desc = "A syndicate bomb."
/datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/M)
if(prob(5))
playsound(get_turf(M), 'sound/effects/explosionfar.ogg', 100, 1)
return ..()
@@ -1092,8 +1089,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Banana Honk"
glass_desc = "A drink from Clown Heaven."
/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/M)
if((ishuman(M) && M.job in list("Clown") ) || ismonkey(M))
/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/carbon/M)
if((ishuman(M) && M.job == "Clown") || ismonkey(M))
M.heal_bodypart_damage(1,1)
. = 1
return ..() || .
@@ -1110,8 +1107,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Silencer"
glass_desc = "A drink from Mime Heaven."
/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/M)
if(ishuman(M) && M.job in list("Mime"))
/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/M)
if(ishuman(M) && M.job == "Mime")
M.heal_bodypart_damage(1,1)
. = 1
return ..() || .
@@ -1165,7 +1162,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Induces magnetism in the imbiber. Started as a barroom prank but evolved to become popular with miners and scrappers. Metallic aftertaste."
/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/carbon/M)
for(var/obj/item/stack/ore/O in orange(3, M))
step_towards(O, get_turf(M))
return ..()
@@ -1183,7 +1180,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Hearty Punch"
glass_desc = "Aromatic beverage served piping hot. According to folk tales it can almost wake the dead."
/datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/carbon/M)
if(M.health <= 0)
M.adjustBruteLoss(-3, 0)
M.adjustFireLoss(-3, 0)
@@ -1217,7 +1214,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Atomic Bomb"
glass_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/M)
M.set_drugginess(50)
if(!M.has_trait(TRAIT_ALCOHOL_TOLERANCE))
M.confused = max(M.confused+2,0)
@@ -1246,7 +1243,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
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."
/datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/carbon/M)
M.dizziness +=1.5
switch(current_cycle)
if(15 to 45)
@@ -1305,7 +1302,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Hippie's Delight"
glass_desc = "A drink enjoyed by people during the 1960's."
/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/M)
if (!M.slurring)
M.slurring = 1
switch(current_cycle)
@@ -1361,7 +1358,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
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!"
/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/carbon/M)
M.cultslurring = min(M.cultslurring + 3, 3)
M.stuttering = min(M.stuttering + 3, 3)
..()
@@ -1410,7 +1407,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
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."
/datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/M)
if(M.mind && M.mind.assigned_role in list("Security Officer", "Detective", "Head of Security", "Warden", "Lawyer")) //Securidrink in line with the screwderiver for engineers or nothing for mimes.
M.heal_bodypart_damage(1, 1)
M.adjustBruteLoss(-2,0)
@@ -1428,7 +1425,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Quintuple Sec"
glass_desc = "Now you are become law, destroyer of clowns."
/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/M)
if(M.mind && M.mind.assigned_role in list("Security Officer", "Detective", "Head of Security", "Warden", "Lawyer")) //Securidrink in line with the screwderiver for engineers or nothing for mimes but STRONG..
M.heal_bodypart_damage(2,2,2)
M.adjustBruteLoss(-5,0)
@@ -1510,7 +1507,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Squirt cider will toughen you right up. Too bad about the musty aftertaste."
shot_glass_icon_state = "shotglassgreen"
/datum/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/carbon/M)
M.satiety += 5 //for context, vitamins give 30 satiety per tick
..()
. = TRUE
@@ -1538,7 +1535,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Sugar Rush"
glass_desc = "If you can't mix a Sugar Rush, you can't tend bar."
/datum/reagent/consumable/ethanol/sugar_rush/on_mob_life(mob/living/M)
/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
..()
. = TRUE
@@ -1579,7 +1576,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Peppermint Patty"
glass_desc = "A boozy minty hot cocoa that warms your belly on a cold night."
/datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
..()
@@ -1682,8 +1679,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of fernet"
glass_desc = "A glass of pure Fernet. Only an absolute madman would drink this alone." //Hi Kevum
/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
M.adjustToxLoss(1*REM, 0)
M.nutrition = max(M.nutrition - 5, 0)
@@ -1701,8 +1697,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of fernet cola"
glass_desc = "A sawed-off cola bottle filled with Fernet Cola. Nothing better after eating like a lardass."
/datum/reagent/consumable/ethanol/fernetcola/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/fernetcola/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
M.adjustToxLoss(0.5*REM, 0)
M.nutrition = max(M.nutrition - 3, 0)
@@ -1721,8 +1716,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of fanciulli"
glass_desc = "A glass of Fanciulli. It's just Manhattan with Fernet."
/datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/M)
M.nutrition = max(M.nutrition - 5, 0)
M.overeatduration = 0
return ..()
@@ -1746,7 +1740,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "A glass of Branca Menta, perfect for those lazy and hot sunday summer afternoons." //Get lazy literally by drinking this
/datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/M)
/datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C)
return ..()

10
code/modules/reagents/chemistry/reagents/blob_reagents.dm
View File

@@ -199,11 +199,9 @@
M.reagents.add_reagent("spore", 0.2*reac_volume)
M.apply_damage(0.7*reac_volume, TOX)
/datum/reagent/blob/regenerative_materia/on_mob_life(mob/living/M)
M.adjustToxLoss(1*REM)
if(iscarbon(M))
var/mob/living/carbon/N = M
N.hal_screwyhud = SCREWYHUD_HEALTHY //fully healed, honest
/datum/reagent/blob/regenerative_materia/on_mob_life(mob/living/carbon/C)
C.adjustToxLoss(1*REM)
C.hal_screwyhud = SCREWYHUD_HEALTHY //fully healed, honest
..()
/datum/reagent/blob/regenerative_materia/on_mob_delete(mob/living/M)
@@ -346,7 +344,7 @@
M.reagents.add_reagent("cryogenic_poison", 0.3*reac_volume)
M.apply_damage(0.2*reac_volume, BRUTE)
/datum/reagent/blob/cryogenic_poison/on_mob_life(mob/living/M)
/datum/reagent/blob/cryogenic_poison/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(0.3*REM, 0)
M.adjustFireLoss(0.3*REM, 0)
M.adjustToxLoss(0.3*REM, 0)

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

@@ -14,7 +14,7 @@
glass_name = "glass of orange juice"
glass_desc = "Vitamins! Yay!"
/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/M)
/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/M)
if(M.getOxyLoss() && prob(30))
M.adjustOxyLoss(-1, 0)
. = 1
@@ -30,7 +30,7 @@
glass_name = "glass of tomato juice"
glass_desc = "Are you sure this is tomato juice?"
/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/M)
/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/M)
if(M.getFireLoss() && prob(20))
M.heal_bodypart_damage(0,1, 0)
. = 1
@@ -46,7 +46,7 @@
glass_name = "glass of lime juice"
glass_desc = "A glass of sweet-sour lime juice."
/datum/reagent/consumable/limejuice/on_mob_life(mob/living/M)
/datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/M)
if(M.getToxLoss() && prob(20))
M.adjustToxLoss(-1*REM, 0)
. = 1
@@ -62,7 +62,7 @@
glass_name = "glass of carrot juice"
glass_desc = "It's just like a carrot but without crunching."
/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/M)
/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/M)
M.adjust_blurriness(-1)
M.adjust_blindness(-1)
switch(current_cycle)
@@ -101,7 +101,7 @@
glass_name = "glass of berry juice"
glass_desc = "Berry juice. Or maybe it's poison. Who cares?"
/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/M)
/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(1, 0)
. = 1
..()
@@ -136,8 +136,8 @@
glass_name = "glass of banana juice"
glass_desc = "The raw essence of a banana. HONK."
/datum/reagent/consumable/banana/on_mob_life(mob/living/M)
if((ishuman(M) && M.job in list("Clown") ) || ismonkey(M))
/datum/reagent/consumable/banana/on_mob_life(mob/living/carbon/M)
if((ishuman(M) && M.job == "Clown") || ismonkey(M))
M.heal_bodypart_damage(1,1, 0)
. = 1
..()
@@ -152,8 +152,8 @@
glass_desc = "Absolutely nothing."
shot_glass_icon_state = "shotglass"
/datum/reagent/consumable/nothing/on_mob_life(mob/living/M)
if(ishuman(M) && M.job in list("Mime"))
/datum/reagent/consumable/nothing/on_mob_life(mob/living/carbon/M)
if(ishuman(M) && M.job == "Mime")
M.heal_bodypart_damage(1,1, 0)
. = 1
..()
@@ -167,8 +167,6 @@
taste_description = "laughter"
/datum/reagent/consumable/laughter/on_mob_life(mob/living/carbon/M)
if(!iscarbon(M))
return
M.emote("laugh")
..()
@@ -181,8 +179,6 @@
taste_description = "laughter"
/datum/reagent/consumable/superlaughter/on_mob_life(mob/living/carbon/M)
if(!iscarbon(M))
return
if(prob(30))
M.visible_message("<span class='danger'>[M] bursts out into a fit of uncontrollable laughter!</span>", "<span class='userdanger'>You burst out in a fit of uncontrollable laughter!</span>")
M.Stun(5)
@@ -216,7 +212,7 @@
glass_name = "glass of milk"
glass_desc = "White and nutritious goodness!"
/datum/reagent/consumable/milk/on_mob_life(mob/living/M)
/datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() && prob(20))
M.heal_bodypart_damage(1,0, 0)
. = 1
@@ -238,7 +234,7 @@
glass_name = "glass of soy milk"
glass_desc = "White and nutritious soy goodness!"
/datum/reagent/consumable/soymilk/on_mob_life(mob/living/M)
/datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() && prob(20))
M.heal_bodypart_damage(1,0, 0)
. = 1
@@ -254,7 +250,7 @@
glass_name = "glass of cream"
glass_desc = "Ewwww..."
/datum/reagent/consumable/cream/on_mob_life(mob/living/M)
/datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() && prob(20))
M.heal_bodypart_damage(1,0, 0)
. = 1
@@ -276,7 +272,7 @@
M.Jitter(5)
..()
/datum/reagent/consumable/coffee/on_mob_life(mob/living/M)
/datum/reagent/consumable/coffee/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40, FALSE)
@@ -298,7 +294,7 @@
glass_name = "glass of tea"
glass_desc = "Drinking it from here would not seem right."
/datum/reagent/consumable/tea/on_mob_life(mob/living/M)
/datum/reagent/consumable/tea/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-2)
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
@@ -320,7 +316,7 @@
glass_name = "Arnold Palmer"
glass_desc = "You feel like taking a few golf swings after a few swigs of this."
/datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/M)
/datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/M)
if(prob(5))
to_chat(M, "<span class = 'notice'>[pick("You remember to square your shoulders.","You remember to keep your head down.","You can't decide between squaring your shoulders and keeping your head down.","You remember to relax.","You think about how someday you'll get two strokes off your golf game.")]</span>")
..()
@@ -337,7 +333,7 @@
glass_name = "iced coffee"
glass_desc = "A drink to perk you up and refresh you!"
/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/M)
/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40, FALSE)
@@ -357,7 +353,7 @@
glass_name = "iced tea"
glass_desc = "All natural, antioxidant-rich flavour sensation."
/datum/reagent/consumable/icetea/on_mob_life(mob/living/M)
/datum/reagent/consumable/icetea/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-2)
M.drowsyness = max(0,M.drowsyness-1)
M.AdjustSleeping(-40, FALSE)
@@ -377,7 +373,7 @@
glass_name = "glass of Space Cola"
glass_desc = "A glass of refreshing Space Cola."
/datum/reagent/consumable/space_cola/on_mob_life(mob/living/M)
/datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-5)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -392,19 +388,15 @@
glass_name = "glass of Nuka Cola"
glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
/datum/reagent/consumable/nuka_cola/on_mob_add(mob/M)
/datum/reagent/consumable/nuka_cola/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.add_trait(TRAIT_GOTTAGOFAST, id)
L.add_trait(TRAIT_GOTTAGOFAST, id)
/datum/reagent/consumable/nuka_cola/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.remove_trait(TRAIT_GOTTAGOFAST, id)
/datum/reagent/consumable/nuka_cola/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_GOTTAGOFAST, id)
..()
/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/M)
/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/M)
M.Jitter(20)
M.set_drugginess(30)
M.dizziness +=1.5
@@ -424,7 +416,7 @@
glass_name = "glass of Space Mountain Wind"
glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/M)
/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-7)
M.AdjustSleeping(-20, FALSE)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -442,7 +434,7 @@
glass_name = "glass of Dr. Gibb"
glass_desc = "Dr. Gibb. Not as dangerous as the glass_name might imply."
/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/M)
/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-6)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -458,7 +450,7 @@
glass_desc = "Space-up. It helps you keep your cool."
/datum/reagent/consumable/space_up/on_mob_life(mob/living/M)
/datum/reagent/consumable/space_up/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -473,7 +465,7 @@
glass_desc = "You're pretty certain a real fruit has never actually touched this."
/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/M)
/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -487,7 +479,7 @@
glass_name = "glass of Pwr Game"
glass_desc = "Goes well with a Vlad's salad."
/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/M)
/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -501,7 +493,7 @@
glass_name = "glass of Shambler's juice"
glass_desc = "Mmm mm, shambly."
/datum/reagent/consumable/shamblers/on_mob_life(mob/living/M)
/datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
/datum/reagent/consumable/sodawater
@@ -514,7 +506,7 @@
glass_name = "glass of soda water"
glass_desc = "Soda water. Why not make a scotch and soda?"
/datum/reagent/consumable/sodawater/on_mob_life(mob/living/M)
/datum/reagent/consumable/sodawater/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -530,7 +522,7 @@
glass_name = "glass of tonic water"
glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
/datum/reagent/consumable/tonic/on_mob_life(mob/living/M)
/datum/reagent/consumable/tonic/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40, FALSE)
@@ -549,7 +541,7 @@
glass_name = "glass of ice"
glass_desc = "Generally, you're supposed to put something else in there too..."
/datum/reagent/consumable/ice/on_mob_life(mob/living/M)
/datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -563,7 +555,7 @@
glass_name = "soy latte"
glass_desc = "A nice and refreshing beverage while you're reading."
/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/M)
/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.SetSleeping(0, FALSE)
@@ -584,7 +576,7 @@
glass_name = "cafe latte"
glass_desc = "A nice, strong and refreshing beverage while you're reading."
/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/M)
/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.SetSleeping(0, FALSE)
@@ -605,7 +597,7 @@
glass_name = "Doctor's Delight"
glass_desc = "The space doctor's favorite. Guaranteed to restore bodily injury; side effects include cravings and hunger."
/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/M)
/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-0.5, 0)
M.adjustFireLoss(-0.5, 0)
M.adjustToxLoss(-0.5, 0)
@@ -739,4 +731,4 @@
color = "#EA1D26"
taste_description = "sweet pomegranates"
glass_name = "glass of grenadine"
glass_desc = "Delicious flavored syrup."
glass_desc = "Delicious flavored syrup."

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

@@ -16,7 +16,7 @@
color = "#60A584" // rgb: 96, 165, 132
overdose_threshold = 30
/datum/reagent/drug/space_drugs/on_mob_life(mob/living/M)
/datum/reagent/drug/space_drugs/on_mob_life(mob/living/carbon/M)
M.set_drugginess(15)
if(isturf(M.loc) && !isspaceturf(M.loc))
if(M.canmove)
@@ -45,7 +45,7 @@
taste_description = "smoke"
trippy = FALSE
/datum/reagent/drug/nicotine/on_mob_life(mob/living/M)
/datum/reagent/drug/nicotine/on_mob_life(mob/living/carbon/M)
if(prob(1))
var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.")
to_chat(M, "<span class='notice'>[smoke_message]</span>")
@@ -66,7 +66,7 @@
overdose_threshold = 20
addiction_threshold = 10
/datum/reagent/drug/crank/on_mob_life(mob/living/M)
/datum/reagent/drug/crank/on_mob_life(mob/living/carbon/M)
if(prob(5))
var/high_message = pick("You feel jittery.", "You feel like you gotta go fast.", "You feel like you need to step it up.")
to_chat(M, "<span class='notice'>[high_message]</span>")
@@ -114,7 +114,7 @@
addiction_threshold = 15
/datum/reagent/drug/krokodil/on_mob_life(mob/living/M)
/datum/reagent/drug/krokodil/on_mob_life(mob/living/carbon/M)
var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.")
if(prob(5))
to_chat(M, "<span class='notice'>[high_message]</span>")
@@ -165,19 +165,15 @@
addiction_threshold = 10
metabolization_rate = 0.75 * REAGENTS_METABOLISM
/datum/reagent/drug/methamphetamine/on_mob_add(mob/M)
/datum/reagent/drug/methamphetamine/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.add_trait(TRAIT_GOTTAGOREALLYFAST, id)
L.add_trait(TRAIT_GOTTAGOREALLYFAST, id)
/datum/reagent/drug/methamphetamine/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.remove_trait(TRAIT_GOTTAGOREALLYFAST, id)
/datum/reagent/drug/methamphetamine/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_GOTTAGOREALLYFAST, id)
..()
/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/M)
/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/M)
var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.")
if(prob(5))
to_chat(M, "<span class='notice'>[high_message]</span>")
@@ -252,27 +248,23 @@
taste_description = "salt" // because they're bathsalts?
var/datum/brain_trauma/special/psychotic_brawling/bath_salts/rage
/datum/reagent/drug/bath_salts/on_mob_add(mob/M)
/datum/reagent/drug/bath_salts/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.add_trait(TRAIT_STUNIMMUNE, id)
L.add_trait(TRAIT_SLEEPIMMUNE, id)
if(iscarbon(L))
var/mob/living/carbon/C = L
rage = new()
C.gain_trauma(rage, TRAUMA_RESILIENCE_ABSOLUTE)
L.add_trait(TRAIT_STUNIMMUNE, id)
L.add_trait(TRAIT_SLEEPIMMUNE, id)
if(iscarbon(L))
var/mob/living/carbon/C = L
rage = new()
C.gain_trauma(rage, TRAUMA_RESILIENCE_ABSOLUTE)
/datum/reagent/drug/bath_salts/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.remove_trait(TRAIT_STUNIMMUNE, id)
L.remove_trait(TRAIT_SLEEPIMMUNE, id)
if(rage)
QDEL_NULL(rage)
/datum/reagent/drug/bath_salts/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_STUNIMMUNE, id)
L.remove_trait(TRAIT_SLEEPIMMUNE, id)
if(rage)
QDEL_NULL(rage)
..()
/datum/reagent/drug/bath_salts/on_mob_life(mob/living/M)
/datum/reagent/drug/bath_salts/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.")
if(prob(5))
to_chat(M, "<span class='notice'>[high_message]</span>")
@@ -352,7 +344,7 @@
reagent_state = LIQUID
color = "#78FFF0"
/datum/reagent/drug/aranesp/on_mob_life(mob/living/M)
/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.")
if(prob(5))
to_chat(M, "<span class='notice'>[high_message]</span>")

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

@@ -14,7 +14,7 @@
taste_mult = 4
var/nutriment_factor = 1 * REAGENTS_METABOLISM
/datum/reagent/consumable/on_mob_life(mob/living/M)
/datum/reagent/consumable/on_mob_life(mob/living/carbon/M)
current_cycle++
M.nutrition += nutriment_factor
holder.remove_reagent(src.id, metabolization_rate)
@@ -30,7 +30,7 @@
var/brute_heal = 1
var/burn_heal = 0
/datum/reagent/consumable/nutriment/on_mob_life(mob/living/M)
/datum/reagent/consumable/nutriment/on_mob_life(mob/living/carbon/M)
if(prob(50))
M.heal_bodypart_damage(brute_heal,burn_heal, 0)
. = 1
@@ -78,7 +78,7 @@
brute_heal = 1
burn_heal = 1
/datum/reagent/consumable/nutriment/vitamin/on_mob_life(mob/living/M)
/datum/reagent/consumable/nutriment/vitamin/on_mob_life(mob/living/carbon/M)
if(M.satiety < 600)
M.satiety += 30
. = ..()
@@ -183,7 +183,7 @@
taste_description = "hot peppers"
taste_mult = 1.5
/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/M)
/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/carbon/M)
var/heating = 0
switch(current_cycle)
if(1 to 15)
@@ -214,7 +214,7 @@
color = "#8BA6E9" // rgb: 139, 166, 233
taste_description = "mint"
/datum/reagent/consumable/frostoil/on_mob_life(mob/living/M)
/datum/reagent/consumable/frostoil/on_mob_life(mob/living/carbon/M)
var/cooling = 0
switch(current_cycle)
if(1 to 15)
@@ -320,7 +320,7 @@
victim.Knockdown(100)
victim.update_damage_hud()
/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/M)
/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/carbon/M)
if(prob(5))
M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>")
..()
@@ -374,7 +374,7 @@
glass_name = "glass of chocolate"
glass_desc = "Tasty."
/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/M)
/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
..()
@@ -386,7 +386,7 @@
metabolization_rate = 0.2 * REAGENTS_METABOLISM
taste_description = "mushroom"
/datum/reagent/mushroomhallucinogen/on_mob_life(mob/living/M)
/datum/reagent/mushroomhallucinogen/on_mob_life(mob/living/carbon/M)
if(!M.slurring)
M.slurring = 1
switch(current_cycle)
@@ -416,7 +416,7 @@
color = "#FF00FF" // rgb: 255, 0, 255
taste_description = "childhood whimsy"
/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/M)
/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/M)
if(ishuman(M) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden"))
M.heal_bodypart_damage(1,1, 0)
. = 1
@@ -465,7 +465,7 @@
color = "#302000" // rgb: 48, 32, 0
taste_description = "wet and cheap noodles"
/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/M)
/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
..()
@@ -477,7 +477,7 @@
color = "#302000" // rgb: 48, 32, 0
taste_description = "wet and cheap noodles on fire"
/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/M)
/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT)
..()
@@ -549,7 +549,7 @@
metabolization_rate = 3 * REAGENTS_METABOLISM
taste_description = "sweet slime"
/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/M)
/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/carbon/M)
holder.add_reagent("sugar", 3)
..()
@@ -562,7 +562,7 @@
metabolization_rate = 1 * REAGENTS_METABOLISM
taste_description = "sweetness"
/datum/reagent/consumable/honey/on_mob_life(mob/living/M)
/datum/reagent/consumable/honey/on_mob_life(mob/living/carbon/M)
M.reagents.add_reagent("sugar",3)
if(prob(55))
M.adjustBruteLoss(-1*REM, 0)
@@ -615,7 +615,7 @@
M.blur_eyes(5)
..()
/datum/reagent/consumable/tearjuice/on_mob_life(mob/living/M)
/datum/reagent/consumable/tearjuice/on_mob_life(mob/living/carbon/M)
..()
if(M.eye_blurry) //Don't worsen vision if it was otherwise fine
M.blur_eyes(4)
@@ -632,7 +632,7 @@
nutriment_factor = 15 * REAGENTS_METABOLISM
color = "#664330" // rgb: 102, 67, 48
/datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/M)
/datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/carbon/M)
if(M.nutrition > NUTRITION_LEVEL_FULL - 25)
M.nutrition -= 3*nutriment_factor
..()
@@ -647,7 +647,7 @@
color = "#1d043d"
taste_description = "bitter mushroom"
/datum/reagent/consumable/entpoly/on_mob_life(mob/living/M)
/datum/reagent/consumable/entpoly/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 10)
M.Unconscious(40, 0)
. = 1
@@ -681,7 +681,7 @@
nutriment_factor = 3 * REAGENTS_METABOLISM
taste_description = "fruity mushroom"
/datum/reagent/consumable/vitfro/on_mob_life(mob/living/M)
/datum/reagent/consumable/vitfro/on_mob_life(mob/living/carbon/M)
if(prob(80))
M.adjustBruteLoss(-1*REM, 0)
M.adjustFireLoss(-1*REM, 0)

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

@@ -10,7 +10,7 @@
id = "medicine"
taste_description = "bitterness"
/datum/reagent/medicine/on_mob_life(mob/living/M)
/datum/reagent/medicine/on_mob_life(mob/living/carbon/M)
current_cycle++
holder.remove_reagent(src.id, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
@@ -20,7 +20,7 @@
description = "Leporazine will effectively regulate a patient's body temperature, ensuring it never leaves safe levels."
color = "#C8A5DC" // rgb: 200, 165, 220
/datum/reagent/medicine/leporazine/on_mob_life(mob/living/M)
/datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/M)
if(M.bodytemperature > BODYTEMP_NORMAL)
M.adjust_bodytemperature(-40 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
else if(M.bodytemperature < (BODYTEMP_NORMAL + 1))
@@ -80,7 +80,7 @@
description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations."
color = "#FF00FF"
/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/M)
/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(M.drowsyness-5, 0)
M.AdjustStun(-20, 0)
M.AdjustKnockdown(-20, 0)
@@ -99,7 +99,7 @@
description = "Reduces drowsiness, hallucinations, and Histamine from body."
color = "#EC536D" // rgb: 236, 83, 109
/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/M)
/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(M.drowsyness-5, 0)
if(holder.has_reagent("mindbreaker"))
holder.remove_reagent("mindbreaker", 5)
@@ -117,7 +117,7 @@
description = "Instantly restores all hearing to the patient, but does not cure deafness."
color = "#6600FF" // rgb: 100, 165, 255
/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/M)
/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/M)
M.restoreEars()
..()
@@ -128,7 +128,7 @@
color = "#0000C8"
taste_description = "sludge"
/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/M)
/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/M)
var/power = -0.00003 * (M.bodytemperature ** 2) + 3
if(M.bodytemperature < T0C)
M.adjustOxyLoss(-3 * power, 0)
@@ -149,7 +149,7 @@
taste_description = "muscle"
metabolization_rate = 1.5 * REAGENTS_METABOLISM
/datum/reagent/medicine/clonexadone/on_mob_life(mob/living/M)
/datum/reagent/medicine/clonexadone/on_mob_life(mob/living/carbon/M)
if(M.bodytemperature < T0C)
M.adjustCloneLoss(0.00006 * (M.bodytemperature ** 2) - 6, 0)
M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
@@ -164,7 +164,7 @@
color = "#f7832a"
taste_description = "spicy jelly"
/datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/M)
/datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/carbon/M)
if(M.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
var/power = 0
switch(M.bodytemperature)
@@ -195,7 +195,7 @@
overdose_threshold = 30
taste_description = "fish"
/datum/reagent/medicine/rezadone/on_mob_life(mob/living/M)
/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.
M.heal_bodypart_damage(1,1)
M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
@@ -237,7 +237,7 @@
M.emote("scream")
..()
/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/M)
/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(-2*REM, 0)
..()
. = 1
@@ -251,7 +251,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
overdose_threshold = 25
/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/M)
/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/carbon/M)
if(M.getFireLoss() > 50)
M.adjustFireLoss(-4*REM, 0) //Twice as effective as silver sulfadiazine for severe burns
else
@@ -286,7 +286,7 @@
..()
/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/M)
/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-2*REM, 0)
..()
. = 1
@@ -303,7 +303,7 @@
var/last_added = 0
var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10 //So that normal blood regeneration can continue with salglu active
/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/M)
/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/M)
if(last_added)
M.blood_volume -= last_added
last_added = 0
@@ -315,7 +315,7 @@
if(prob(33))
M.adjustBruteLoss(-0.5*REM, 0)
M.adjustFireLoss(-0.5*REM, 0)
. = 1
. = TRUE
..()
/datum/reagent/medicine/salglu_solution/overdose_process(mob/living/M)
@@ -330,7 +330,7 @@
if(prob(33))
M.adjustBruteLoss(0.5*REM, 0)
M.adjustFireLoss(0.5*REM, 0)
. = 1
. = TRUE
..()
/datum/reagent/medicine/mine_salve
@@ -341,14 +341,12 @@
color = "#6D6374"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/M)
if(iscarbon(M))
var/mob/living/carbon/N = M
N.hal_screwyhud = SCREWYHUD_HEALTHY
M.adjustBruteLoss(-0.25*REM, 0)
M.adjustFireLoss(-0.25*REM, 0)
/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/C)
C.hal_screwyhud = SCREWYHUD_HEALTHY
C.adjustBruteLoss(-0.25*REM, 0)
C.adjustFireLoss(-0.25*REM, 0)
..()
. = 1
return TRUE
/datum/reagent/medicine/mine_salve/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
@@ -400,7 +398,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "ash"
/datum/reagent/medicine/charcoal/on_mob_life(mob/living/M)
/datum/reagent/medicine/charcoal/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(-2*REM, 0)
. = 1
for(var/datum/reagent/R in M.reagents.reagent_list)
@@ -417,7 +415,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 30
/datum/reagent/medicine/omnizine/on_mob_life(mob/living/M)
/datum/reagent/medicine/omnizine/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(-0.5*REM, 0)
M.adjustOxyLoss(-0.5*REM, 0)
M.adjustBruteLoss(-0.5*REM, 0)
@@ -442,7 +440,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "acid"
/datum/reagent/medicine/calomel/on_mob_life(mob/living/M)
/datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/M)
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,2.5)
@@ -459,7 +457,7 @@
color = "#14FF3C"
metabolization_rate = 2 * REAGENTS_METABOLISM
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M)
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/M)
if(M.radiation > 0)
M.radiation -= min(M.radiation, 8)
..()
@@ -472,7 +470,7 @@
color = "#E6FFF0"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M)
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/M)
M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/50
M.adjustToxLoss(-2*REM, 0)
for(var/datum/reagent/R in M.reagents.reagent_list)
@@ -491,7 +489,7 @@
overdose_threshold = 25
/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/M)
/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() > 50)
M.adjustBruteLoss(-4*REM, 0) //Twice as effective as styptic powder for severe bruising
else
@@ -513,7 +511,7 @@
color = "#00FFFF"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/M)
/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/carbon/M)
M.adjustOxyLoss(-3*REM, 0)
if(M.losebreath >= 4)
M.losebreath -= 2
@@ -535,7 +533,7 @@
M.adjustBruteLoss(-0.5*REM, 0)
M.adjustFireLoss(-0.5*REM, 0)
..()
. = 1
return TRUE
/datum/reagent/medicine/ephedrine
name = "Ephedrine"
@@ -547,32 +545,28 @@
overdose_threshold = 45
addiction_threshold = 30
/datum/reagent/medicine/ephedrine/on_mob_add(mob/M)
/datum/reagent/medicine/ephedrine/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.add_trait(TRAIT_GOTTAGOFAST, id)
L.add_trait(TRAIT_GOTTAGOFAST, id)
/datum/reagent/medicine/ephedrine/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.remove_trait(TRAIT_GOTTAGOFAST, id)
/datum/reagent/medicine/ephedrine/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_GOTTAGOFAST, id)
..()
/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/M)
/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/M)
M.AdjustStun(-20, 0)
M.AdjustKnockdown(-20, 0)
M.AdjustUnconscious(-20, 0)
M.adjustStaminaLoss(-1*REM, 0)
..()
. = 1
return TRUE
/datum/reagent/medicine/ephedrine/overdose_process(mob/living/M)
if(prob(33))
M.adjustToxLoss(0.5*REM, 0)
M.losebreath++
. = 1
..()
return TRUE
/datum/reagent/medicine/ephedrine/addiction_act_stage1(mob/living/M)
if(prob(33))
@@ -610,7 +604,7 @@
color = "#64FFE6"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/M)
/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/M)
if(prob(10))
M.drowsyness += 1
M.jitteriness -= 1
@@ -627,19 +621,15 @@
overdose_threshold = 30
addiction_threshold = 25
/datum/reagent/medicine/morphine/on_mob_add(mob/M)
/datum/reagent/medicine/morphine/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.add_trait(TRAIT_IGNORESLOWDOWN, id)
L.add_trait(TRAIT_IGNORESLOWDOWN, id)
/datum/reagent/medicine/morphine/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.remove_trait(TRAIT_IGNORESLOWDOWN, id)
/datum/reagent/medicine/morphine/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_IGNORESLOWDOWN, id)
..()
/datum/reagent/medicine/morphine/on_mob_life(mob/living/M)
/datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/M)
switch(current_cycle)
if(11)
to_chat(M, "<span class='warning'>You start to feel tired...</span>" )
@@ -699,7 +689,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
taste_description = "dull toxin"
/datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
/datum/reagent/medicine/oculine/on_mob_life(mob/living/carbon/M)
var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
if (!eyes)
return
@@ -730,7 +720,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 35
/datum/reagent/medicine/atropine/on_mob_life(mob/living/M)
/datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/M)
if(M.health < 0)
M.adjustToxLoss(-2*REM, 0)
M.adjustBruteLoss(-2*REM, 0)
@@ -759,7 +749,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 30
/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/M)
/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/M)
if(M.health < 0)
M.adjustToxLoss(-0.5*REM, 0)
M.adjustBruteLoss(-0.5*REM, 0)
@@ -816,7 +806,7 @@
add_logs(M, M, "revived", src)
..()
/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/M)
/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(0.5*REM, 0)
M.adjustFireLoss(0.5*REM, 0)
..()
@@ -828,12 +818,10 @@
description = "Efficiently restores brain damage."
color = "#DCDCFF"
/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M)
M.adjustBrainLoss(-2*REM)
if(iscarbon(M))
var/mob/living/carbon/C = M
if(prob(10))
C.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC)
/datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/C)
C.adjustBrainLoss(-2*REM)
if(prob(10))
C.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC)
..()
/datum/reagent/medicine/mutadone
@@ -843,7 +831,7 @@
color = "#5096C8"
taste_description = "acid"
/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/human/M)
/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/M)
M.jitteriness = 0
if(M.has_dna())
M.dna.remove_all_mutations()
@@ -857,7 +845,7 @@
color = "#00B4C8"
taste_description = "raw egg"
/datum/reagent/medicine/antihol/on_mob_life(mob/living/M)
/datum/reagent/medicine/antihol/on_mob_life(mob/living/carbon/M)
M.dizziness = 0
M.drowsyness = 0
M.slurring = 0
@@ -878,19 +866,15 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
overdose_threshold = 60
/datum/reagent/medicine/stimulants/on_mob_add(mob/M)
/datum/reagent/medicine/stimulants/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.add_trait(TRAIT_GOTTAGOFAST, id)
L.add_trait(TRAIT_GOTTAGOFAST, id)
/datum/reagent/medicine/stimulants/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.remove_trait(TRAIT_GOTTAGOFAST, id)
/datum/reagent/medicine/stimulants/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_GOTTAGOFAST, id)
..()
/datum/reagent/medicine/stimulants/on_mob_life(mob/living/M)
/datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/M)
if(M.health < 50 && M.health > 0)
M.adjustOxyLoss(-1*REM, 0)
M.adjustToxLoss(-1*REM, 0)
@@ -919,7 +903,7 @@
color = "#FFFFF0"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
/datum/reagent/medicine/insulin/on_mob_life(mob/living/M)
/datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/M)
if(M.AdjustSleeping(-20, FALSE))
. = 1
M.reagents.remove_reagent("sugar", 3)
@@ -934,7 +918,7 @@
color = "#C8A5DC"
overdose_threshold = 30
/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M)
/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-2*REM, 0)
..()
. = 1
@@ -952,7 +936,7 @@
color = "#C8A5DC"
overdose_threshold = 30
/datum/reagent/medicine/dexalin/on_mob_life(mob/living/M)
/datum/reagent/medicine/dexalin/on_mob_life(mob/living/carbon/M)
M.adjustOxyLoss(-2*REM, 0)
..()
. = 1
@@ -970,7 +954,7 @@
color = "#C8A5DC"
overdose_threshold = 30
/datum/reagent/medicine/kelotane/on_mob_life(mob/living/M)
/datum/reagent/medicine/kelotane/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(-2*REM, 0)
..()
. = 1
@@ -989,7 +973,7 @@
overdose_threshold = 30
taste_description = "a roll of gauze"
/datum/reagent/medicine/antitoxin/on_mob_life(mob/living/M)
/datum/reagent/medicine/antitoxin/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(-2*REM, 0)
for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
M.reagents.remove_reagent(R.id,1)
@@ -1008,7 +992,7 @@
reagent_state = LIQUID
color = "#C8A5DC"
/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/M)
/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/M)
if(M.losebreath >= 5)
M.losebreath -= 5
..()
@@ -1022,7 +1006,7 @@
overdose_threshold = 30
taste_description = "grossness"
/datum/reagent/medicine/tricordrazine/on_mob_life(mob/living/M)
/datum/reagent/medicine/tricordrazine/on_mob_life(mob/living/carbon/M)
if(prob(80))
M.adjustBruteLoss(-1*REM, 0)
M.adjustFireLoss(-1*REM, 0)
@@ -1047,7 +1031,7 @@
color = "#91D865"
taste_description = "jelly"
/datum/reagent/medicine/regen_jelly/on_mob_life(mob/living/M)
/datum/reagent/medicine/regen_jelly/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-1.5*REM, 0)
M.adjustFireLoss(-1.5*REM, 0)
M.adjustOxyLoss(-1.5*REM, 0)
@@ -1062,7 +1046,7 @@
reagent_state = SOLID
color = "#555555"
/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/M)
/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.
M.adjustFireLoss(-5*REM, 0)
M.adjustOxyLoss(-15, 0)
@@ -1079,7 +1063,7 @@
color = rgb(255, 175, 0)
overdose_threshold = 25
/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/M)
/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-3 * REM, 0)
M.adjustFireLoss(-3 * REM, 0)
M.adjustOxyLoss(-15 * REM, 0)
@@ -1106,7 +1090,7 @@
color = "#27870a"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/M)
/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/carbon/M)
for(var/datum/reagent/drug/R in M.reagents.reagent_list)
M.reagents.remove_reagent(R.id,5)
M.drowsyness += 2
@@ -1118,7 +1102,7 @@
M.adjustBrainLoss(1*REM, 50)
M.adjustStaminaLoss(2.5*REM, 0)
..()
. = 1
return TRUE
/datum/reagent/medicine/miningnanites
name = "Nanites"
@@ -1128,17 +1112,17 @@
overdose_threshold = 3 //To prevent people stacking massive amounts of a very strong healing reagent
can_synth = FALSE
/datum/reagent/medicine/miningnanites/on_mob_life(mob/living/M)
/datum/reagent/medicine/miningnanites/on_mob_life(mob/living/carbon/M)
M.heal_bodypart_damage(5,5)
..()
. = 1
return TRUE
/datum/reagent/medicine/miningnanites/overdose_process(mob/living/M)
M.adjustBruteLoss(3*REM, 0)
M.adjustFireLoss(3*REM, 0)
M.adjustToxLoss(3*REM, 0)
..()
. = 1
return TRUE
//used for changeling's adrenaline power
/datum/reagent/medicine/changelingadrenaline
@@ -1148,18 +1132,18 @@
color = "#C8A5DC"
overdose_threshold = 30
/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/M as mob)
/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/M as mob)
M.AdjustUnconscious(-20, 0)
M.AdjustStun(-20, 0)
M.AdjustKnockdown(-20, 0)
M.adjustStaminaLoss(-1, 0)
. = 1
..()
return TRUE
/datum/reagent/medicine/changelingadrenaline/overdose_process(mob/living/M as mob)
M.adjustToxLoss(1, 0)
. = 1
..()
return TRUE
/datum/reagent/medicine/changelinghaste
name = "Changeling Haste"
@@ -1168,22 +1152,18 @@
color = "#C8A5DC"
metabolization_rate = 1
/datum/reagent/medicine/changelinghaste/on_mob_add(mob/M)
/datum/reagent/medicine/changelinghaste/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.add_trait(TRAIT_GOTTAGOREALLYFAST, id)
L.add_trait(TRAIT_GOTTAGOREALLYFAST, id)
/datum/reagent/medicine/changelinghaste/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.remove_trait(TRAIT_GOTTAGOREALLYFAST, id)
/datum/reagent/medicine/changelinghaste/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_GOTTAGOREALLYFAST, id)
..()
/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/M as mob)
/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(2, 0)
. = 1
..()
return TRUE
/datum/reagent/medicine/corazone
// Heart attack code will not do damage if corazone is present
@@ -1226,7 +1206,7 @@
M.remove_trait(TRAIT_SLEEPIMMUNE, id)
..()
/datum/reagent/medicine/modafinil/on_mob_life(mob/living/M)
/datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/M)
if(!overdosed) // We do not want any effects on OD
overdose_threshold = overdose_threshold + rand(-10,10)/10 // for extra fun
M.AdjustStun(-5, 0)
@@ -1235,7 +1215,7 @@
M.adjustStaminaLoss(-0.5*REM, 0)
M.Jitter(1)
metabolization_rate = 0.01 * REAGENTS_METABOLISM * rand(5,20) // randomizes metabolism between 0.02 and 0.08 per tick
. = 1
. = TRUE
..()
/datum/reagent/medicine/modafinil/overdose_start(mob/living/M)
@@ -1272,5 +1252,4 @@
M.adjustOxyLoss(1.5*REM, 0)
M.adjustStaminaLoss(1.5*REM, 0)
..()
. = 1
return TRUE

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

@@ -11,7 +11,7 @@
glass_desc = "Are you sure this is tomato juice?"
shot_glass_icon_state = "shotglassred"
/datum/reagent/blood/reaction_mob(mob/M, method=TOUCH, reac_volume)
/datum/reagent/blood/reaction_mob(mob/living/L, method=TOUCH, reac_volume)
if(data && data["viruses"])
for(var/thing in data["viruses"])
var/datum/disease/D = thing
@@ -19,15 +19,13 @@
if((D.spread_flags & DISEASE_SPREAD_SPECIAL) || (D.spread_flags & DISEASE_SPREAD_NON_CONTAGIOUS))
continue
if(isliving(M))
var/mob/living/L = M
if((method == TOUCH || method == VAPOR) && (D.spread_flags & DISEASE_SPREAD_CONTACT_FLUIDS))
L.ContactContractDisease(D)
else //ingest, patch or inject
L.ForceContractDisease(D)
if((method == TOUCH || method == VAPOR) && (D.spread_flags & DISEASE_SPREAD_CONTACT_FLUIDS))
L.ContactContractDisease(D)
else //ingest, patch or inject
L.ForceContractDisease(D)
if(iscarbon(M))
var/mob/living/carbon/C = M
if(iscarbon(L))
var/mob/living/carbon/C = L
if(C.get_blood_id() == "blood" && (method == INJECT || (method == INGEST && C.dna && C.dna.species && (DRINKSBLOOD in C.dna.species.species_traits))))
if(!data || !(data["blood_type"] in get_safe_blood(C.dna.blood_type)))
C.reagents.add_reagent("toxin", reac_volume * 0.5)
@@ -99,10 +97,7 @@
color = "#C81040" // rgb: 200, 16, 64
taste_description = "slime"
/datum/reagent/vaccine/reaction_mob(mob/M, method=TOUCH, reac_volume)
if(!isliving(M))
return
var/mob/living/L = M
/datum/reagent/vaccine/reaction_mob(mob/living/L, method=TOUCH, reac_volume)
if(islist(data) && (method == INGEST || method == INJECT))
for(var/thing in L.diseases)
var/datum/disease/D = thing
@@ -195,16 +190,12 @@
glass_name = "glass of holy water"
glass_desc = "A glass of holy water."
/datum/reagent/water/holywater/on_mob_add(mob/M)
/datum/reagent/water/holywater/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.add_trait(TRAIT_HOLY, id)
L.add_trait(TRAIT_HOLY, id)
/datum/reagent/water/holywater/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.remove_trait(TRAIT_HOLY, id)
/datum/reagent/water/holywater/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_HOLY, id)
..()
/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -212,7 +203,7 @@
to_chat(M, "<span class='userdanger'>A darkness begins to spread its unholy tendrils through your mind, purging the Justiciar's influence!</span>")
..()
/datum/reagent/water/holywater/on_mob_life(mob/living/M)
/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
if(!data)
data = 1
data++
@@ -276,7 +267,7 @@
return
return ..()
/datum/reagent/fuel/unholywater/on_mob_life(mob/living/M)
/datum/reagent/fuel/unholywater/on_mob_life(mob/living/carbon/M)
if(iscultist(M))
M.drowsyness = max(M.drowsyness-5, 0)
M.AdjustUnconscious(-20, 0)
@@ -296,7 +287,7 @@
M.adjustOxyLoss(2, 0)
M.adjustBruteLoss(2, 0)
holder.remove_reagent(id, 1)
. = 1
return TRUE
/datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god
name = "Hell Water"
@@ -304,13 +295,13 @@
description = "YOUR FLESH! IT BURNS!"
taste_description = "burning"
/datum/reagent/hellwater/on_mob_life(mob/living/M)
/datum/reagent/hellwater/on_mob_life(mob/living/carbon/M)
M.fire_stacks = min(5,M.fire_stacks + 3)
M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire
M.adjustToxLoss(1, 0)
M.adjustFireLoss(1, 0) //Hence the other damages... ain't I a bastard?
M.adjustBrainLoss(5, 150)
holder.remove_reagent(src.id, 1)
holder.remove_reagent(id, 1)
/datum/reagent/medicine/omnizine/godblood
name = "Godblood"
@@ -620,10 +611,12 @@
taste_description = "slime"
/datum/reagent/mulligan/on_mob_life(mob/living/carbon/human/H)
..()
if (!istype(H))
return
to_chat(H, "<span class='warning'><b>You grit your teeth in pain as your body rapidly mutates!</b></span>")
H.visible_message("<b>[H]</b> suddenly transforms!")
randomize_human(H)
..()
/datum/reagent/aslimetoxin
name = "Advanced Mutation Toxin"
@@ -632,10 +625,7 @@
color = "#13BC5E" // rgb: 19, 188, 94
taste_description = "slime"
/datum/reagent/aslimetoxin/reaction_mob(mob/M, method=TOUCH, reac_volume)
if(!isliving(M))
return
var/mob/living/L = M
/datum/reagent/aslimetoxin/reaction_mob(mob/living/L, method=TOUCH, reac_volume)
if(method != TOUCH)
L.ForceContractDisease(new /datum/disease/transformation/slime(), FALSE, TRUE)
@@ -647,10 +637,7 @@
can_synth = FALSE
taste_description = "decay"
/datum/reagent/gluttonytoxin/reaction_mob(mob/M, method=TOUCH, reac_volume)
if(!isliving(M))
return
var/mob/living/L = M
/datum/reagent/gluttonytoxin/reaction_mob(mob/living/L, method=TOUCH, reac_volume)
L.ForceContractDisease(new /datum/disease/transformation/morph(), FALSE, TRUE)
/datum/reagent/serotrotium
@@ -661,7 +648,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
taste_description = "bitterness"
/datum/reagent/serotrotium/on_mob_life(mob/living/M)
/datum/reagent/serotrotium/on_mob_life(mob/living/carbon/M)
if(ishuman(M))
if(prob(7))
M.emote(pick("twitch","drool","moan","gasp"))
@@ -745,7 +732,7 @@
color = "#484848" // rgb: 72, 72, 72A
taste_mult = 0 // apparently tasteless.
/datum/reagent/mercury/on_mob_life(mob/living/M)
/datum/reagent/mercury/on_mob_life(mob/living/carbon/M)
if(M.canmove && !isspaceturf(M.loc))
step(M, pick(GLOB.cardinals))
if(prob(5))
@@ -783,7 +770,7 @@
color = "#808080" // rgb: 128, 128, 128
taste_description = "chlorine"
/datum/reagent/chlorine/on_mob_life(mob/living/M)
/datum/reagent/chlorine/on_mob_life(mob/living/carbon/M)
M.take_bodypart_damage(1*REM, 0, 0, 0)
. = 1
..()
@@ -796,7 +783,7 @@
color = "#808080" // rgb: 128, 128, 128
taste_description = "acid"
/datum/reagent/fluorine/on_mob_life(mob/living/M)
/datum/reagent/fluorine/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(1*REM, 0)
. = 1
..()
@@ -825,7 +812,7 @@
color = "#808080" // rgb: 128, 128, 128
taste_description = "metal"
/datum/reagent/lithium/on_mob_life(mob/living/M)
/datum/reagent/lithium/on_mob_life(mob/living/carbon/M)
if(M.canmove && !isspaceturf(M.loc))
step(M, pick(GLOB.cardinals))
if(prob(5))
@@ -847,7 +834,7 @@
color = "#C7C7C7" // rgb: 199,199,199
taste_description = "the colour blue and regret"
/datum/reagent/radium/on_mob_life(mob/living/M)
/datum/reagent/radium/on_mob_life(mob/living/carbon/M)
M.apply_effect(2*REM/M.metabolism_efficiency,EFFECT_IRRADIATE,0)
..()
@@ -866,9 +853,8 @@
color = "#C8A5DC" // rgb: 200, 165, 220
taste_description = "bitterness"
/datum/reagent/space_cleaner/sterilizine/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(iscarbon(M) && (method in list(TOUCH, VAPOR, PATCH)))
var/mob/living/carbon/C = M
/datum/reagent/space_cleaner/sterilizine/reaction_mob(mob/living/carbon/C, method=TOUCH, reac_volume)
if(method in list(TOUCH, VAPOR, PATCH))
for(var/s in C.surgeries)
var/datum/surgery/S = s
S.success_multiplier = max(0.2, S.success_multiplier)
@@ -884,16 +870,12 @@
color = "#C8A5DC" // rgb: 200, 165, 220
/datum/reagent/iron/on_mob_life(mob/living/M)
if(iscarbon(M))
var/mob/living/carbon/C = M
if(C.blood_volume < BLOOD_VOLUME_NORMAL)
C.blood_volume += 0.5
/datum/reagent/iron/on_mob_life(mob/living/carbon/C)
if(C.blood_volume < BLOOD_VOLUME_NORMAL)
C.blood_volume += 0.5
..()
/datum/reagent/iron/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(!isliving(M))
return
if(M.has_bane(BANE_IRON)) //If the target is weak to cold iron, then poison them.
if(holder && holder.chem_temp < 100) // COLD iron.
M.reagents.add_reagent("toxin", reac_volume)
@@ -916,8 +898,6 @@
taste_description = "expensive yet reasonable metal"
/datum/reagent/silver/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(!isliving(M))
return
if(M.has_bane(BANE_SILVER))
M.reagents.add_reagent("toxin", reac_volume)
..()
@@ -930,7 +910,7 @@
color = "#B8B8C0" // rgb: 184, 184, 192
taste_description = "the inside of a reactor"
/datum/reagent/uranium/on_mob_life(mob/living/M)
/datum/reagent/uranium/on_mob_life(mob/living/carbon/M)
M.apply_effect(1/M.metabolism_efficiency,EFFECT_IRRADIATE,0)
..()
@@ -955,7 +935,7 @@
do_teleport(M, get_turf(M), (reac_volume / 5), asoundin = 'sound/effects/phasein.ogg') //4 tiles per crystal
..()
/datum/reagent/bluespace/on_mob_life(mob/living/M)
/datum/reagent/bluespace/on_mob_life(mob/living/carbon/M)
if(current_cycle > 10 && prob(15))
to_chat(M, "<span class='warning'>You feel unstable...</span>")
M.Jitter(2)
@@ -993,17 +973,15 @@
glass_desc = "Unless you're an industrial tool, this is probably not safe for consumption."
/datum/reagent/fuel/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with welding fuel to make them easy to ignite!
if(!isliving(M))
return
if(method == TOUCH || method == VAPOR)
M.adjust_fire_stacks(reac_volume / 10)
return
..()
/datum/reagent/fuel/on_mob_life(mob/living/M)
/datum/reagent/fuel/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(1, 0)
. = 1
..()
return TRUE
/datum/reagent/space_cleaner
name = "Space cleaner"
@@ -1030,7 +1008,7 @@
for(var/mob/living/simple_animal/slime/M in T)
M.adjustToxLoss(rand(5,10))
/datum/reagent/space_cleaner/reaction_mob(mob/M, method=TOUCH, reac_volume)
/datum/reagent/space_cleaner/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(method == TOUCH || method == VAPOR)
M.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
if(iscarbon(M))
@@ -1069,7 +1047,7 @@
metabolization_rate = 1.5 * REAGENTS_METABOLISM
taste_description = "acid"
/datum/reagent/space_cleaner/ez_clean/on_mob_life(mob/living/M)
/datum/reagent/space_cleaner/ez_clean/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(3.33)
M.adjustFireLoss(3.33)
M.adjustToxLoss(3.33)
@@ -1089,7 +1067,7 @@
metabolization_rate = 1.5 * REAGENTS_METABOLISM
taste_description = "sourness"
/datum/reagent/cryptobiolin/on_mob_life(mob/living/M)
/datum/reagent/cryptobiolin/on_mob_life(mob/living/carbon/M)
M.Dizzy(1)
if(!M.confused)
M.confused = 1
@@ -1103,7 +1081,7 @@
color = "#C8A5DC" // rgb: 200, 165, 220A
taste_description = "numbness"
/datum/reagent/impedrezene/on_mob_life(mob/living/M)
/datum/reagent/impedrezene/on_mob_life(mob/living/carbon/M)
M.jitteriness = max(M.jitteriness-5,0)
if(prob(80))
M.adjustBrainLoss(2*REM)
@@ -1121,10 +1099,7 @@
can_synth = FALSE
taste_description = "sludge"
/datum/reagent/nanites/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
if(!isliving(M))
return
var/mob/living/L = M
/datum/reagent/nanites/reaction_mob(mob/living/L, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
L.ForceContractDisease(new /datum/disease/transformation/robot(), FALSE, TRUE)
@@ -1136,10 +1111,7 @@
can_synth = FALSE
taste_description = "sludge"
/datum/reagent/xenomicrobes/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
if(!isliving(M))
return
var/mob/living/L = M
/datum/reagent/xenomicrobes/reaction_mob(mob/living/L, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
L.ForceContractDisease(new /datum/disease/transformation/xeno(), FALSE, TRUE)
@@ -1151,10 +1123,7 @@
can_synth = FALSE
taste_description = "slime"
/datum/reagent/fungalspores/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
if(!isliving(M))
return
var/mob/living/L = M
/datum/reagent/fungalspores/reaction_mob(mob/living/L, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
L.ForceContractDisease(new /datum/disease/tuberculosis(), FALSE, TRUE)
@@ -1236,11 +1205,11 @@
var/temp = holder ? holder.chem_temp : T20C
T.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]")
/datum/reagent/nitrous_oxide/reaction_mob(mob/M, method=TOUCH, reac_volume)
/datum/reagent/nitrous_oxide/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(method == VAPOR)
M.drowsyness += max(round(reac_volume, 1), 2)
/datum/reagent/nitrous_oxide/on_mob_life(mob/living/M)
/datum/reagent/nitrous_oxide/on_mob_life(mob/living/carbon/M)
M.drowsyness += 2
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -1259,19 +1228,15 @@
color = "E1A116"
taste_description = "sourness"
/datum/reagent/stimulum/on_mob_add(mob/M)
/datum/reagent/stimulum/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.add_trait(TRAIT_GOTTAGOFAST, id)
L.add_trait(TRAIT_GOTTAGOFAST, id)
/datum/reagent/stimulum/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.remove_trait(TRAIT_GOTTAGOFAST, id)
/datum/reagent/stimulum/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_GOTTAGOFAST, id)
..()
/datum/reagent/stimulum/on_mob_life(mob/living/M) // Has a speedup, and the anti-stun effects of nicotine.
/datum/reagent/stimulum/on_mob_life(mob/living/carbon/M) // Has a speedup, and the anti-stun effects of nicotine.
M.AdjustStun(-20, 0)
M.AdjustKnockdown(-20, 0)
M.AdjustUnconscious(-20, 0)
@@ -1289,16 +1254,12 @@
color = "90560B"
taste_description = "burning"
/datum/reagent/nitryl/on_mob_add(mob/M)
/datum/reagent/nitryl/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.add_trait(TRAIT_GOTTAGOFAST, id)
L.add_trait(TRAIT_GOTTAGOFAST, id)
/datum/reagent/nitryl/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.remove_trait(TRAIT_GOTTAGOFAST, id)
/datum/reagent/nitryl/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_GOTTAGOFAST, id)
..()
/////////////////////////Coloured Crayon Powder////////////////////////////
@@ -1394,7 +1355,7 @@
var/tox_prob = 0
taste_description = "plant food"
/datum/reagent/plantnutriment/on_mob_life(mob/living/M)
/datum/reagent/plantnutriment/on_mob_life(mob/living/carbon/M)
if(prob(tox_prob))
M.adjustToxLoss(1*REM, 0)
. = 1
@@ -1448,12 +1409,9 @@
taste_description = "bitterness"
taste_mult = 1.5
/datum/reagent/stable_plasma/on_mob_life(mob/living/M)
if(iscarbon(M))
var/mob/living/carbon/C = M
C.adjustPlasma(10)
/datum/reagent/stable_plasma/on_mob_life(mob/living/carbon/C)
C.adjustPlasma(10)
..()
return
/datum/reagent/iodine
name = "Iodine"
@@ -1476,7 +1434,6 @@
var/turf/open/floor/F = T
F.PlaceOnTop(/turf/open/floor/carpet)
..()
return
/datum/reagent/bromine
name = "Bromine"
@@ -1520,14 +1477,12 @@
taste_description = "rainbows"
/datum/reagent/colorful_reagent/on_mob_life(mob/living/M)
if(M && isliving(M))
M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
/datum/reagent/colorful_reagent/on_mob_life(mob/living/carbon/M)
M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
..()
/datum/reagent/colorful_reagent/reaction_mob(mob/living/M, reac_volume)
if(M && isliving(M))
M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
..()
/datum/reagent/colorful_reagent/reaction_obj(obj/O, reac_volume)
@@ -1686,7 +1641,7 @@
color = "#00ff80"
taste_description = "strange honey"
/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/M)
/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/carbon/M)
if(prob(2))
M.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz..."))
..()
@@ -1807,16 +1762,12 @@
taste_description = "water"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
/datum/reagent/pax/on_mob_add(mob/M)
/datum/reagent/pax/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.add_trait(TRAIT_PACIFISM, id)
L.add_trait(TRAIT_PACIFISM, id)
/datum/reagent/pax/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.remove_trait(TRAIT_PACIFISM, id)
/datum/reagent/pax/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_PACIFISM, id)
..()
/datum/reagent/bz_metabolites
@@ -1855,7 +1806,7 @@
metabolization_rate = 1.5 * REAGENTS_METABOLISM
taste_description = "dizziness"
/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/M)
/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/carbon/M)
if(M.confused < 6)
M.confused = CLAMP(M.confused + 3, 0, 5)
if(M.dizziness < 6)
@@ -1871,7 +1822,7 @@
metabolization_rate = 1.5 * REAGENTS_METABOLISM
taste_description = "tiredness"
/datum/reagent/peaceborg/tire/on_mob_life(mob/living/M)
/datum/reagent/peaceborg/tire/on_mob_life(mob/living/carbon/M)
var/healthcomp = (100 - M.health) //DOES NOT ACCOUNT FOR ADMINBUS THINGS THAT MAKE YOU HAVE MORE THAN 200/210 HEALTH, OR SOMETHING OTHER THAN A HUMAN PROCESSING THIS.
if(M.getStaminaLoss() < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.)
M.adjustStaminaLoss(10)

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

@@ -11,10 +11,10 @@
if(reac_volume >= 1)
T.AddComponent(/datum/component/thermite, reac_volume)
/datum/reagent/thermite/on_mob_life(mob/living/M)
/datum/reagent/thermite/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(1, 0)
..()
. = 1
return TRUE
/datum/reagent/nitroglycerin
name = "Nitroglycerin"
@@ -40,12 +40,12 @@
metabolization_rate = 4
taste_description = "burning"
/datum/reagent/clf3/on_mob_life(mob/living/M)
/datum/reagent/clf3/on_mob_life(mob/living/carbon/M)
M.adjust_fire_stacks(2)
var/burndmg = max(0.3*M.fire_stacks, 0.3)
M.adjustFireLoss(burndmg, 0)
..()
. = 1
return TRUE
/datum/reagent/clf3/reaction_turf(turf/T, reac_volume)
if(isplatingturf(T))
@@ -100,7 +100,7 @@
metabolization_rate = 0.05
taste_description = "salt"
/datum/reagent/blackpowder/on_mob_life(mob/living/M)
/datum/reagent/blackpowder/on_mob_life(mob/living/carbon/M)
..()
if(isplasmaman(M))
M.hallucination += 5
@@ -151,12 +151,12 @@
M.IgniteMob()
..()
/datum/reagent/phlogiston/on_mob_life(mob/living/M)
/datum/reagent/phlogiston/on_mob_life(mob/living/carbon/M)
M.adjust_fire_stacks(1)
var/burndmg = max(0.3*M.fire_stacks, 0.3)
M.adjustFireLoss(burndmg, 0)
..()
. = 1
return TRUE
/datum/reagent/napalm
name = "Napalm"
@@ -166,7 +166,7 @@
color = "#FA00AF"
taste_description = "burning"
/datum/reagent/napalm/on_mob_life(mob/living/M)
/datum/reagent/napalm/on_mob_life(mob/living/carbon/M)
M.adjust_fire_stacks(1)
..()
@@ -184,7 +184,7 @@
taste_description = "bitterness"
/datum/reagent/cryostylane/on_mob_life(mob/living/M) //TODO: code freezing into an ice cube
/datum/reagent/cryostylane/on_mob_life(mob/living/carbon/M) //TODO: code freezing into an ice cube
if(M.reagents.has_reagent("oxygen"))
M.reagents.remove_reagent("oxygen", 0.5)
M.adjust_bodytemperature(-15)
@@ -203,7 +203,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "bitterness"
/datum/reagent/pyrosium/on_mob_life(mob/living/M)
/datum/reagent/pyrosium/on_mob_life(mob/living/carbon/M)
if(M.reagents.has_reagent("oxygen"))
M.reagents.remove_reagent("oxygen", 0.5)
M.adjust_bodytemperature(15)
@@ -219,7 +219,7 @@
taste_description = "charged metal"
var/shock_timer = 0
/datum/reagent/teslium/on_mob_life(mob/living/M)
/datum/reagent/teslium/on_mob_life(mob/living/carbon/M)
shock_timer++
if(shock_timer >= rand(5,30)) //Random shocks are wildly unpredictable
shock_timer = 0
@@ -235,7 +235,7 @@
color = "#CAFF43"
taste_description = "jelly"
/datum/reagent/teslium/energized_jelly/on_mob_life(mob/living/M)
/datum/reagent/teslium/energized_jelly/on_mob_life(mob/living/carbon/M)
if(isjellyperson(M))
shock_timer = 0 //immune to shocks
M.AdjustStun(-40, 0)
@@ -280,9 +280,7 @@
O.extinguish()
/datum/reagent/firefighting_foam/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(!istype(M))
return
if(method in list(VAPOR, TOUCH))
M.adjust_fire_stacks(-reac_volume)
M.ExtinguishMob()
..()
..()

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

@@ -10,10 +10,10 @@
taste_mult = 1.2
var/toxpwr = 1.5
/datum/reagent/toxin/on_mob_life(mob/living/M)
/datum/reagent/toxin/on_mob_life(mob/living/carbon/M)
if(toxpwr)
M.adjustToxLoss(toxpwr*REM, 0)
. = 1
. = TRUE
..()
/datum/reagent/toxin/amatoxin
@@ -48,9 +48,8 @@
M.domutcheck()
..()
/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/M)
if(istype(M))
M.apply_effect(5,EFFECT_IRRADIATE,0)
/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/C)
C.apply_effect(5,EFFECT_IRRADIATE,0)
return ..()
/datum/reagent/toxin/plasma
@@ -63,12 +62,10 @@
color = "#8228A0"
toxpwr = 3
/datum/reagent/toxin/plasma/on_mob_life(mob/living/M)
/datum/reagent/toxin/plasma/on_mob_life(mob/living/carbon/C)
if(holder.has_reagent("epinephrine"))
holder.remove_reagent("epinephrine", 2*REM)
if(iscarbon(M))
var/mob/living/carbon/C = M
C.adjustPlasma(20)
C.adjustPlasma(20)
return ..()
/datum/reagent/toxin/plasma/reaction_obj(obj/O, reac_volume)
@@ -84,8 +81,6 @@
return
/datum/reagent/toxin/plasma/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with plasma is stronger than fuel!
if(!isliving(M))
return
if(method == TOUCH || method == VAPOR)
M.adjust_fire_stacks(reac_volume / 5)
return
@@ -99,19 +94,17 @@
toxpwr = 0
taste_description = "acid"
/datum/reagent/toxin/lexorin/on_mob_life(mob/living/M)
/datum/reagent/toxin/lexorin/on_mob_life(mob/living/carbon/C)
. = TRUE
if(M.has_trait(TRAIT_NOBREATH))
if(C.has_trait(TRAIT_NOBREATH))
. = FALSE
if(.)
M.adjustOxyLoss(5, 0)
if(iscarbon(M))
var/mob/living/carbon/C = M
C.losebreath += 2
C.adjustOxyLoss(5, 0)
C.losebreath += 2
if(prob(20))
M.emote("gasp")
C.emote("gasp")
..()
/datum/reagent/toxin/slimejelly
@@ -123,7 +116,7 @@
taste_description = "slime"
taste_mult = 1.3
/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/M)
/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/carbon/M)
if(prob(10))
to_chat(M, "<span class='danger'>Your insides are burning!</span>")
M.adjustToxLoss(rand(20,60)*REM, 0)
@@ -141,7 +134,7 @@
toxpwr = 0
taste_description = "mint"
/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/M)
/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/carbon/M)
if(M.has_trait(TRAIT_FAT))
M.gib()
return ..()
@@ -163,16 +156,12 @@
toxpwr = 0.5
taste_description = "death"
/datum/reagent/toxin/zombiepowder/on_mob_add(mob/M)
/datum/reagent/toxin/zombiepowder/on_mob_add(mob/living/L)
..()
if(isliving(M))
var/mob/living/L = M
L.fakedeath(id)
L.fakedeath(id)
/datum/reagent/toxin/zombiepowder/on_mob_delete(mob/M)
if(isliving(M))
var/mob/living/L = M
L.cure_fakedeath(id)
/datum/reagent/toxin/zombiepowder/on_mob_delete(mob/living/L)
L.cure_fakedeath(id)
..()
/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/carbon/M)
@@ -188,7 +177,7 @@
toxpwr = 0
taste_description = "sourness"
/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/M)
/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/carbon/M)
M.hallucination += 5
return ..()
@@ -244,12 +233,10 @@
color = "#9ACD32"
toxpwr = 1
/datum/reagent/toxin/spore/on_mob_life(mob/living/M)
if(iscarbon(M))
var/mob/living/carbon/C = M
C.damageoverlaytemp = 60
C.update_damage_hud()
M.blur_eyes(3)
/datum/reagent/toxin/spore/on_mob_life(mob/living/carbon/C)
C.damageoverlaytemp = 60
C.update_damage_hud()
C.blur_eyes(3)
return ..()
/datum/reagent/toxin/spore_burning
@@ -260,7 +247,7 @@
toxpwr = 0.5
taste_description = "burning"
/datum/reagent/toxin/spore_burning/on_mob_life(mob/living/M)
/datum/reagent/toxin/spore_burning/on_mob_life(mob/living/carbon/M)
M.adjust_fire_stacks(2)
M.IgniteMob()
return ..()
@@ -274,7 +261,7 @@
toxpwr = 0
metabolization_rate = 1.5 * REAGENTS_METABOLISM
/datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/M)
/datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/carbon/M)
switch(current_cycle)
if(1 to 10)
M.confused += 2
@@ -297,7 +284,7 @@
toxpwr = 0
metabolization_rate = 1.5 * REAGENTS_METABOLISM
/datum/reagent/toxin/chloralhydratedelayed/on_mob_life(mob/living/M)
/datum/reagent/toxin/chloralhydratedelayed/on_mob_life(mob/living/carbon/M)
switch(current_cycle)
if(10 to 20)
M.confused += 1
@@ -317,7 +304,7 @@
glass_name = "glass of beer"
glass_desc = "A freezing pint of beer."
/datum/reagent/toxin/fakebeer/on_mob_life(mob/living/M)
/datum/reagent/toxin/fakebeer/on_mob_life(mob/living/carbon/M)
switch(current_cycle)
if(1 to 50)
M.Sleeping(40, 0)
@@ -377,7 +364,7 @@
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 0
/datum/reagent/toxin/polonium/on_mob_life(mob/living/M)
/datum/reagent/toxin/polonium/on_mob_life(mob/living/carbon/M)
M.radiation += 4
..()
@@ -391,7 +378,7 @@
overdose_threshold = 30
toxpwr = 0
/datum/reagent/toxin/histamine/on_mob_life(mob/living/M)
/datum/reagent/toxin/histamine/on_mob_life(mob/living/carbon/M)
if(prob(50))
switch(pick(1, 2, 3, 4))
if(1)
@@ -424,7 +411,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 1
/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/M)
/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/carbon/M)
if(prob(5))
holder.add_reagent("histamine", pick(5,15))
holder.remove_reagent("formaldehyde", 1.2)
@@ -440,7 +427,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
toxpwr = 0
/datum/reagent/toxin/venom/on_mob_life(mob/living/M)
/datum/reagent/toxin/venom/on_mob_life(mob/living/carbon/M)
toxpwr = 0.2*volume
M.adjustBruteLoss((0.3*volume)*REM, 0)
. = 1
@@ -459,14 +446,14 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 0
/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/M)
/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/carbon/M)
M.adjustBrainLoss(3*REM, 150)
. = 1
if(M.toxloss <= 60)
M.adjustToxLoss(1*REM, 0)
if(current_cycle >= 18)
M.Sleeping(40, 0)
..()
return TRUE
/datum/reagent/toxin/cyanide
name = "Cyanide"
@@ -477,7 +464,7 @@
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 1.25
/datum/reagent/toxin/cyanide/on_mob_life(mob/living/M)
/datum/reagent/toxin/cyanide/on_mob_life(mob/living/carbon/M)
if(prob(5))
M.losebreath += 1
if(prob(8))
@@ -509,7 +496,7 @@
if(method == TOUCH || method == VAPOR)
M.reagents.add_reagent("itching_powder", reac_volume)
/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/M)
/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/M)
if(prob(15))
to_chat(M, "You scratch at your head.")
M.adjustBruteLoss(0.2*REM, 0)
@@ -537,28 +524,26 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 2.5
/datum/reagent/toxin/initropidril/on_mob_life(mob/living/M)
/datum/reagent/toxin/initropidril/on_mob_life(mob/living/carbon/C)
if(prob(25))
var/picked_option = rand(1,3)
switch(picked_option)
if(1)
M.Knockdown(60, 0)
. = 1
C.Knockdown(60, 0)
. = TRUE
if(2)
M.losebreath += 10
M.adjustOxyLoss(rand(5,25), 0)
. = 1
C.losebreath += 10
C.adjustOxyLoss(rand(5,25), 0)
. = TRUE
if(3)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(!H.undergoing_cardiac_arrest() && H.can_heartattack())
H.set_heartattack(TRUE)
if(H.stat == CONSCIOUS)
H.visible_message("<span class='userdanger'>[H] clutches at [H.p_their()] chest as if [H.p_their()] heart stopped!</span>")
else
H.losebreath += 10
H.adjustOxyLoss(rand(5,25), 0)
. = 1
if(!C.undergoing_cardiac_arrest() && C.can_heartattack())
C.set_heartattack(TRUE)
if(C.stat == CONSCIOUS)
C.visible_message("<span class='userdanger'>[C] clutches at [C.p_their()] chest as if [C.p_their()] heart stopped!</span>")
else
C.losebreath += 10
C.adjustOxyLoss(rand(5,25), 0)
. = TRUE
return ..() || .
/datum/reagent/toxin/pancuronium
@@ -571,10 +556,10 @@
toxpwr = 0
taste_mult = 0 // undetectable, I guess?
/datum/reagent/toxin/pancuronium/on_mob_life(mob/living/M)
/datum/reagent/toxin/pancuronium/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 10)
M.Stun(40, 0)
. = 1
. = TRUE
if(prob(20))
M.losebreath += 4
..()
@@ -588,12 +573,12 @@
metabolization_rate = 0.75 * REAGENTS_METABOLISM
toxpwr = 0
/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/M)
/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 10)
M.Sleeping(40, 0)
M.adjustStaminaLoss(10*REM, 0)
..()
. = 1
return TRUE
/datum/reagent/toxin/sulfonal
name = "Sulfonal"
@@ -604,7 +589,7 @@
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 0.5
/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/M)
/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 22)
M.Sleeping(40, 0)
return ..()
@@ -634,7 +619,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 0
/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/M)
/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
M.adjustToxLoss(1*REM, 0)
M.nutrition = max(M.nutrition - 3, 0) // making the chef more valuable, one meme trap at a time
@@ -650,7 +635,7 @@
metabolization_rate = 0.06 * REAGENTS_METABOLISM
toxpwr = 1.75
/datum/reagent/toxin/coniine/on_mob_life(mob/living/M)
/datum/reagent/toxin/coniine/on_mob_life(mob/living/carbon/M)
M.losebreath += 5
return ..()
@@ -665,22 +650,20 @@
toxpwr = 0
taste_description = "vomit"
/datum/reagent/toxin/spewium/on_mob_life(mob/living/M)
/datum/reagent/toxin/spewium/on_mob_life(mob/living/carbon/C)
.=..()
if(current_cycle >=11 && prob(min(50,current_cycle)) && ishuman(M))
var/mob/living/carbon/human/H = M
H.vomit(10, prob(10), prob(50), rand(0,4), TRUE, prob(30))
for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
if(current_cycle >=11 && prob(min(50,current_cycle)))
C.vomit(10, prob(10), prob(50), rand(0,4), TRUE, prob(30))
for(var/datum/reagent/toxin/R in C.reagents.reagent_list)
if(R != src)
H.reagents.remove_reagent(R.id,1)
C.reagents.remove_reagent(R.id,1)
/datum/reagent/toxin/spewium/overdose_process(mob/living/M)
/datum/reagent/toxin/spewium/overdose_process(mob/living/carbon/C)
. = ..()
if(current_cycle >=33 && prob(15) && ishuman(M))
var/mob/living/carbon/human/H = M
H.spew_organ()
H.vomit(0, TRUE, TRUE, 4)
to_chat(H, "<span class='userdanger'>You feel something lumpy come up as you vomit.</span>")
if(current_cycle >=33 && prob(15))
C.spew_organ()
C.vomit(0, TRUE, TRUE, 4)
to_chat(C, "<span class='userdanger'>You feel something lumpy come up as you vomit.</span>")
/datum/reagent/toxin/curare
name = "Curare"
@@ -691,7 +674,7 @@
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 1
/datum/reagent/toxin/curare/on_mob_life(mob/living/M)
/datum/reagent/toxin/curare/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 11)
M.Knockdown(60, 0)
M.adjustOxyLoss(1*REM, 0)
@@ -707,7 +690,7 @@
metabolization_rate = 0.2 * REAGENTS_METABOLISM
toxpwr = 0
/datum/reagent/toxin/heparin/on_mob_life(mob/living/M)
/datum/reagent/toxin/heparin/on_mob_life(mob/living/carbon/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
H.bleed_rate = min(H.bleed_rate + 2, 8)
@@ -726,7 +709,7 @@
toxpwr = 0.5
taste_description = "spinning"
/datum/reagent/toxin/rotatium/on_mob_life(mob/living/M)
/datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/M)
if(M.hud_used)
if(current_cycle >= 20 && current_cycle%20 == 0)
var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
@@ -753,7 +736,7 @@
toxpwr = 0.25
taste_description = "skewing"
/datum/reagent/toxin/skewium/on_mob_life(mob/living/M)
/datum/reagent/toxin/skewium/on_mob_life(mob/living/carbon/M)
if(M.hud_used)
if(current_cycle >= 5 && current_cycle % 3 == 0)
var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
@@ -788,7 +771,7 @@
metabolization_rate = 0.08 * REAGENTS_METABOLISM
toxpwr = 0.15
/datum/reagent/toxin/anacea/on_mob_life(mob/living/M)
/datum/reagent/toxin/anacea/on_mob_life(mob/living/carbon/M)
var/remove_amt = 5
if(holder.has_reagent("calomel") || holder.has_reagent("pen_acid"))
remove_amt = 0.5
@@ -841,7 +824,7 @@
toxpwr = 2
acidpwr = 42.0
/datum/reagent/toxin/acid/fluacid/on_mob_life(mob/living/M)
/datum/reagent/toxin/acid/fluacid/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(current_cycle/10, 0)
. = 1
..()
@@ -857,7 +840,7 @@
var/actual_toxpwr = 5
var/delay = 30
/datum/reagent/toxin/delayed/on_mob_life(mob/living/M)
/datum/reagent/toxin/delayed/on_mob_life(mob/living/carbon/M)
if(current_cycle > delay)
holder.remove_reagent(id, actual_metaboliztion_rate * M.metabolism_efficiency)
M.adjustToxLoss(actual_toxpwr*REM, 0)