cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 02:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into universal-damage

Browse Source
This commit is contained in:
Fox McCloud
2019-09-14 21:15:31 -04:00
parent 5943ad2902 8ec0477f76
commit 1bfb442d40
212 changed files with 2977 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/alcohol.dm
-1
View File
@@ -362,7 +362,6 @@
drink_icon = "cubalibreglass"
drink_name = "Cuba Libre"
drink_desc = "A classic mix of rum and cola."
taste_description = "fruity alcohol"
taste_description = "liberation"
/datum/reagent/consumable/ethanol/whiskey_cola
code/modules/reagents/chemistry/reagents/disease.dm
+14 -1
View File
@@ -5,6 +5,7 @@
reagent_state = SOLID
color = "#FFFFFF"
can_synth = FALSE
taste_mult = 0
/datum/reagent/spider_eggs/on_mob_life(mob/living/M)
if(volume > 2.5)
@@ -20,6 +21,7 @@
description = "Microscopic construction robots."
color = "#535E66" // rgb: 83, 94, 102
can_synth = FALSE
taste_mult = 0
/datum/reagent/nanomachines/on_mob_life(mob/living/carbon/M)
if(volume > 1.5)
@@ -33,6 +35,7 @@
description = "Microbes with an entirely alien cellular structure."
color = "#535E66" // rgb: 83, 94, 102
can_synth = FALSE
taste_mult = 0
/datum/reagent/xenomicrobes/on_mob_life(mob/living/carbon/M)
if(volume > 1.5)
@@ -45,6 +48,7 @@
description = "Active fungal spores."
color = "#92D17D" // rgb: 146, 209, 125
can_synth = FALSE
taste_mult = 0
/datum/reagent/fungalspores/on_mob_life(mob/living/carbon/M)
if(volume > 2.5)
@@ -58,6 +62,7 @@
reagent_state = SOLID
color = "#FA0000" // rgb: 250, 0, 0
can_synth = FALSE
taste_mult = 0
/datum/reagent/jagged_crystals/on_mob_life(mob/living/carbon/M)
M.ForceContractDisease(new /datum/disease/berserker(0))
@@ -70,6 +75,7 @@
reagent_state = LIQUID
color = "#1E4600"
can_synth = FALSE
taste_mult = 0
/datum/reagent/salmonella/on_mob_life(mob/living/carbon/M)
M.ForceContractDisease(new /datum/disease/food_poisoning(0))
@@ -82,6 +88,7 @@
reagent_state = LIQUID
color = "#FF0000"
can_synth = FALSE
taste_mult = 0
/datum/reagent/gibbis/on_mob_life(mob/living/carbon/M)
if(volume > 2.5)
@@ -95,6 +102,7 @@
reagent_state = LIQUID
color = "#FFFFFF"
can_synth = FALSE
taste_mult = 0
/datum/reagent/prions/on_mob_life(mob/living/carbon/M)
if(volume > 4.5)
@@ -108,6 +116,7 @@
reagent_state = LIQUID
color = "#465046"
can_synth = FALSE
taste_mult = 0
/datum/reagent/grave_dust/on_mob_life(mob/living/carbon/M)
if(volume > 4.5)
@@ -121,6 +130,7 @@
reagent_state = LIQUID
color = "#F7E6B1"
can_synth = FALSE
taste_description = "bacon"
/datum/reagent/bacon_grease/on_mob_life(mob/living/carbon/M)
if(volume > 4.5)
@@ -134,6 +144,7 @@
reagent_state = SOLID
color = "#925D6C"
can_synth = FALSE
taste_mult = 0
/datum/reagent/heartworms/on_mob_life(mob/living/carbon/M)
if(volume > 4.5)
@@ -152,6 +163,7 @@
reagent_state = LIQUID
color = "#AB1CCF"
can_synth = FALSE
taste_mult = 0
/datum/reagent/concentrated_initro/on_mob_life(mob/living/M)
if(volume >= 5)
@@ -170,6 +182,7 @@
reagent_state = LIQUID
nutriment_factor = 2 * REAGENTS_METABOLISM
color = "#899613" // rgb: 137, 150, 19
taste_description = "watery milk"
/datum/reagent/mutagen/mutagenvirusfood
name = "mutagenic agar"
@@ -198,4 +211,4 @@
/datum/reagent/plasma_dust/plasmavirusfood/weak
name = "weakened virus plasma"
id = "weakplasmavirusfood"
color = "#CEC3C6" // rgb: 206,195,198
color = "#CEC3C6" // rgb: 206,195,198
code/modules/reagents/chemistry/reagents/drugs.dm
+5 -17
View File
@@ -1,18 +1,3 @@
/datum/reagent/serotrotium
name = "Serotrotium"
id = "serotrotium"
description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans."
reagent_state = LIQUID
color = "#202040" // rgb: 20, 20, 40
metabolization_rate = 0.25 * REAGENTS_METABOLISM
/datum/reagent/serotrotium/on_mob_life(mob/living/M)
if(ishuman(M))
if(prob(7))
M.emote(pick("twitch","drool","moan","gasp"))
return ..()
/datum/reagent/lithium
name = "Lithium"
id = "lithium"
@@ -170,6 +155,7 @@
color = "#60A584" // rgb: 96, 165, 132
overdose_threshold = 20
addiction_chance = 50
taste_description = "bitterness"
/datum/reagent/crank/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -475,7 +461,7 @@
reagent_state = LIQUID
color = "#644600"
addiction_chance = 30
taste_description = "puke... or worse"
taste_description = "the inside of a toilet... or worse"
/datum/reagent/jenkem/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -491,6 +477,7 @@
description = "An illegal performance enhancing drug. Side effects might include chest pain, seizures, swelling, headache, fever... ... ..."
reagent_state = LIQUID
color = "#60A584" // rgb: 96, 165, 132
taste_description = "bitterness"
/datum/reagent/aranesp/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -515,6 +502,7 @@
description = "A mild psychoactive chemical extracted from the cannabis plant."
reagent_state = LIQUID
color = "#0FBE0F"
taste_description = "man like, totally the best like, thing ever dude"
/datum/reagent/thc/on_mob_life(mob/living/M)
M.stuttering += rand(0,2)
@@ -697,7 +685,7 @@
process_flags = SYNTHETIC
overdose_threshold = 20
addiction_chance = 50
taste_description = "silicone"
taste_description = "silicon"
/datum/reagent/surge/on_mob_life(mob/living/M)
code/modules/reagents/chemistry/reagents/food.dm
+40 -25
View File
@@ -25,6 +25,8 @@
reagent_state = SOLID
nutriment_factor = 15 * REAGENTS_METABOLISM
color = "#664330" // rgb: 102, 67, 48
var/brute_heal = 1
var/burn_heal = 0
/datum/reagent/consumable/nutriment/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -33,10 +35,8 @@
var/mob/living/carbon/human/H = M
if(H.can_eat(diet_flags)) //Make sure the species has it's dietflag set, otherwise it can't digest any nutrients
if(prob(50))
update_flags |= M.adjustBruteLoss(-1, FALSE)
if(!(NO_BLOOD in H.dna.species.species_traits))//do not restore blood on things with no blood by nature.
if(H.blood_volume < BLOOD_VOLUME_NORMAL)
H.blood_volume += 0.4
update_flags |= M.adjustBruteLoss(-brute_heal, FALSE)
update_flags |= M.adjustFireLoss(-burn_heal, FALSE)
return ..() | update_flags
/datum/reagent/consumable/nutriment/on_new(list/supplied_data)
@@ -66,36 +66,26 @@
id = "protein"
description = "Various essential proteins and fats commonly found in animal flesh and blood."
diet_flags = DIET_CARN | DIET_OMNI
taste_description = "meat" //TODO: Remove
/datum/reagent/consumable/nutriment/plantmatter // Plant-based biomatter, digestable by herbivores and omnivores, worthless to carnivores
name = "Plant-matter"
id = "plantmatter"
description = "Vitamin-rich fibers and natural sugars commonly found in fresh produce."
diet_flags = DIET_HERB | DIET_OMNI
taste_description = "vegetables" //TODO: Remove
/datum/reagent/consumable/vitamin
/datum/reagent/consumable/nutriment/vitamin
name = "Vitamin"
id = "vitamin"
description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form."
reagent_state = SOLID
color = "#664330" // rgb: 102, 67, 48
taste_description = "nutrition"
brute_heal = 1
burn_heal = 1
/datum/reagent/consumable/vitamin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(50))
update_flags |= M.adjustBruteLoss(-1, FALSE)
update_flags |= M.adjustFireLoss(-1, FALSE)
/datum/reagent/consumable/nutriment/vitamin/on_mob_life(mob/living/M)
if(M.satiety < 600)
M.satiety += 30
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(!(NO_BLOOD in H.dna.species.species_traits))//do not restore blood on things with no blood by nature.
if(H.blood_volume < BLOOD_VOLUME_NORMAL)
H.blood_volume += 0.5
return ..() | update_flags
return ..()
/datum/reagent/consumable/sugar
name = "Sugar"
@@ -346,6 +336,31 @@
M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
return ..()
/datum/reagent/consumable/garlic
name = "Garlic Juice"
id = "garlic"
description = "Crushed garlic. Chefs love it, but it can make you smell bad."
color = "#FEFEFE"
taste_description = "garlic"
metabolization_rate = 0.15 * REAGENTS_METABOLISM
/datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/M)
var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.mind && H.mind.vampire && !H.mind.vampire.get_ability(/datum/vampire_passive/full)) //incapacitating but not lethal.
if(prob(min(25, current_cycle)))
to_chat(H, "<span class='danger'>You can't get the scent of garlic out of your nose! You can barely think...</span>")
H.Weaken(1)
H.Jitter(10)
H.fakevomit()
else
if(H.job == "Chef")
if(prob(20)) //stays in the system much longer than sprinkles/banana juice, so heals slower to partially compensate
update_flags |= H.adjustBruteLoss(-1, FALSE)
update_flags |= H.adjustFireLoss(-1, FALSE)
return ..() | update_flags
/datum/reagent/consumable/sprinkles
name = "Sprinkles"
id = "sprinkles"
@@ -951,7 +966,7 @@
id = "entpoly"
description = "An ichor, derived from a certain mushroom, makes for a bad time."
color = "#1d043d"
taste_description = "mold"
taste_description = "bitter mushroom"
/datum/reagent/consumable/entpoly/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -970,13 +985,13 @@
id = "tinlux"
description = "A stimulating ichor which causes luminescent fungi to grow on the skin. "
color = "#b5a213"
var/light_activated = 0
taste_description = "mold"
var/light_activated = FALSE
taste_description = "tingling mushroom"
/datum/reagent/consumable/tinlux/on_mob_life(mob/living/M)
if(!light_activated)
M.set_light(2)
light_activated = 1
light_activated = TRUE
return ..()
/datum/reagent/consumable/tinlux/on_mob_delete(mob/living/M)
@@ -988,11 +1003,11 @@
description = "A bubbly paste that heals wounds of the skin."
color = "#d3a308"
nutriment_factor = 3 * REAGENTS_METABOLISM
taste_description = "sweetness"
taste_description = "fruity mushroom"
/datum/reagent/consumable/vitfro/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(80))
update_flags |= M.adjustBruteLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
update_flags |= M.adjustFireLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
return ..() | update_flags
return ..() | update_flags
code/modules/reagents/chemistry/reagents/medicine.dm
+9 -6
View File
@@ -1,6 +1,7 @@
/datum/reagent/medicine
name = "Medicine"
id = "medicine"
taste_description = "bitterness"
/datum/reagent/medicine/on_mob_life(mob/living/M)
current_cycle++
@@ -290,11 +291,6 @@
addiction_chance = 5
taste_description = "health"
/datum/reagent/medicine/omnizine/godblood
name = "Godblood"
description = "Slowly heals all damage types. Has a rather high overdose threshold. Glows with mysterious power."
overdose_threshold = 150
/datum/reagent/medicine/omnizine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
update_flags |= M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
@@ -728,7 +724,7 @@
id = "mannitol"
description = "Mannitol is a sugar alcohol that can help alleviate cranial swelling."
color = "#D1D1F1"
taste_description = "neurogenisis"
taste_description = "sweetness"
/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -786,6 +782,7 @@
description = "Increases run speed and eliminates stuns, can heal minor damage. If overdosed it will deal toxin damage and stun."
color = "#C8A5DC"
can_synth = FALSE
taste_description = "<span class='userdanger'>an unstoppable force</span>"
/datum/reagent/medicine/stimulants/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -962,6 +959,12 @@
metabolization_rate = 0.1
taste_description = "faint hope"
/datum/reagent/medicine/omnizine_diluted/godblood
name = "Godblood"
id = "godblood"
description = "Slowly heals all damage types. Has a rather high overdose threshold. Glows with mysterious power."
overdose_threshold = 150
/datum/reagent/medicine/omnizine_diluted/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
update_flags |= M.adjustToxLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
code/modules/reagents/chemistry/reagents/misc.dm
+4
View File
@@ -614,6 +614,7 @@
description = "A potent alchemic ingredient."
reagent_state = LIQUID
color = "#092D09"
taste_description = "alchemy"
/datum/reagent/woolbat
name = "Wool of bat"
@@ -621,6 +622,7 @@
description = "A potent alchemic ingredient."
reagent_state = LIQUID
color = "#080808"
taste_description = "alchemy"
/datum/reagent/tonguedog
name = "Tongue of dog"
@@ -628,6 +630,7 @@
description = "A potent alchemic ingredient."
reagent_state = LIQUID
color = "#2D0909"
taste_description = "alchemy"
/datum/reagent/triplepiss
name = "Triplepiss"
@@ -635,6 +638,7 @@
description = "Ewwwwwwwww."
reagent_state = LIQUID
color = "#857400"
taste_description = "alchemy"
/datum/reagent/spraytan
name = "Spray Tan"
code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+10 -1
View File
@@ -5,6 +5,7 @@
reagent_state = LIQUID
color = "#FFAF00"
process_flags = ORGANIC | SYNTHETIC
taste_description = "burning"
var/temp_fire = 4000
var/temp_deviance = 1000
var/size_divisor = 40
@@ -49,6 +50,7 @@
reagent_state = LIQUID
process_flags = ORGANIC | SYNTHETIC
color = "#C86432"
taste_description = "burning"
/datum/reagent/napalm/reaction_temperature(exposed_temperature, exposed_volume)
if(exposed_temperature > T0C + 100)
@@ -253,6 +255,7 @@
description = "Sends everything flying from the detonation point."
reagent_state = LIQUID
color = "#FFA500"
taste_description = "air and bitterness"
/datum/reagent/sorium/reaction_turf(turf/T, volume) // oh no
if(prob(75))
@@ -269,7 +272,7 @@
description = "Sucks everything into the detonation point."
reagent_state = LIQUID
color = "#800080"
taste_description = "the end of the world"
taste_description = "compressed bitterness"
/datum/reagent/liquid_dark_matter/reaction_turf(turf/T, volume) //Oh gosh, why
if(prob(75))
@@ -302,6 +305,7 @@
reagent_state = LIQUID
color = "#FFFF00"
penetrates_skin = TRUE
taste_description = "salt"
/datum/reagent/smoke_powder
name = "Smoke Powder"
@@ -309,6 +313,7 @@
description = "Makes a large cloud of smoke that can carry reagents."
reagent_state = LIQUID
color = "#808080"
taste_description = "smoke"
/datum/reagent/sonic_powder
name = "Sonic Powder"
@@ -317,6 +322,7 @@
reagent_state = LIQUID
color = "#0000FF"
penetrates_skin = TRUE
taste_description = "loud noises"
/datum/reagent/cryostylane
name = "Cryostylane"
@@ -324,6 +330,7 @@
description = "Comes into existence at 20K. As long as there is sufficient oxygen for it to react with, Cryostylane slowly cools all other reagents in the mob down to 0K."
color = "#B2B2FF" // rgb: 139, 166, 233
process_flags = ORGANIC | SYNTHETIC
taste_description = "bitterness"
/datum/reagent/cryostylane/on_mob_life(mob/living/M) //TODO: code freezing into an ice cube
if(M.reagents.has_reagent("oxygen"))
@@ -358,6 +365,7 @@
description = "Comes into existence at 20K. As long as there is sufficient oxygen for it to react with, Pyrosium slowly heats all other reagents."
color = "#B20000" // rgb: 139, 166, 233
process_flags = ORGANIC | SYNTHETIC
taste_description = "bitterness"
/datum/reagent/pyrosium/on_mob_life(mob/living/M)
if(M.reagents.has_reagent("oxygen"))
@@ -380,6 +388,7 @@
reagent_state = LIQUID
color = "#A0A090"
var/cooling_temperature = 3 // more effective than water
taste_description = "the inside of a fire extinguisher"
/datum/reagent/firefighting_foam/reaction_mob(mob/living/M, method=TOUCH, volume)
// Put out fire
code/modules/reagents/chemistry/reagents/toxins.dm
+25 -2
View File
@@ -5,6 +5,7 @@
reagent_state = LIQUID
color = "#CF3600" // rgb: 207, 54, 0
taste_mult = 1.2
taste_description = "bitterness"
/datum/reagent/toxin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -17,6 +18,7 @@
description = "A toxic venom injected by spacefaring arachnids."
reagent_state = LIQUID
color = "#CF3600" // rgb: 207, 54, 0
taste_description = "bitterness"
/datum/reagent/spider_venom/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -81,6 +83,7 @@
reagent_state = LIQUID
color = "#13BC5E" // rgb: 19, 188, 94
can_synth = FALSE
taste_description = "slime"
/datum/reagent/aslimetoxin/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method != TOUCH)
@@ -95,7 +98,6 @@
color = "#484848" // rgb: 72, 72, 72
metabolization_rate = 0.2
penetrates_skin = TRUE
taste_description = "metal"
taste_mult = 0 // elemental mercury is tasteless
/datum/reagent/mercury/on_mob_life(mob/living/M)
@@ -127,7 +129,7 @@
color = "#6A6054"
penetrates_skin = TRUE
process_flags = ORGANIC | SYNTHETIC
taste_description = "spicy freshness"
taste_description = "acid"
/datum/reagent/fluorine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -142,6 +144,7 @@
reagent_state = SOLID
color = "#C7C7C7" // rgb: 199,199,199
penetrates_skin = TRUE
taste_description = "the colour blue and regret"
/datum/reagent/radium/on_mob_life(mob/living/M)
if(M.radiation < 80)
@@ -160,6 +163,7 @@
color = "#04DF27"
metabolization_rate = 0.3
taste_mult = 0.9
taste_description = "slime"
/datum/reagent/mutagen/reaction_mob(mob/living/M, method=TOUCH, volume)
if(!..())
@@ -186,6 +190,7 @@
description = "Just the regular, boring sort of mutagenic compound. Works in a completely predictable manner."
reagent_state = LIQUID
color = "#7DFF00"
taste_description = "slime"
/datum/reagent/stable_mutagen/on_mob_life(mob/living/M)
if(!ishuman(M) || !M.dna)
@@ -251,6 +256,7 @@
reagent_state = SOLID
color = "#B8B8C0" // rgb: 184, 184, 192
taste_mult = 0
taste_description = "the inside of a reactor"
/datum/reagent/uranium/on_mob_life(mob/living/M)
M.apply_effect(2, IRRADIATE, negate_armor = 1)
@@ -268,6 +274,7 @@
reagent_state = LIQUID
color = "#52685D"
metabolization_rate = 0.2
taste_description = "sweetness"
/datum/reagent/lexorin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -382,6 +389,7 @@
description = "A deadly neurotoxin produced by the dreaded spess carp."
reagent_state = LIQUID
color = "#003333" // rgb: 0, 51, 51
taste_description = "fish"
/datum/reagent/carpotoxin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -395,6 +403,7 @@
reagent_state = LIQUID
color = "#6E2828"
data = 13
taste_description = "bitterness"
/datum/reagent/staminatoxin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -408,6 +417,7 @@
id = "spore"
description = "A natural toxin produced by blob spores that inhibits vision when ingested."
color = "#9ACD32"
taste_description = "bitterness"
/datum/reagent/spores/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -426,6 +436,7 @@
drink_name = "Beer glass"
drink_desc = "A freezing pint of beer"
taste_description = "beer"
taste_description = "piss water"
/datum/reagent/beer2/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -537,6 +548,7 @@
reagent_state = LIQUID
color = "#DED6D0"
penetrates_skin = TRUE
taste_description = "bitterness"
/datum/reagent/formaldehyde/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -554,6 +566,7 @@
metabolization_rate = 0.2
overdose_threshold = 40
can_synth = FALSE
taste_mult = 0
/datum/reagent/venom/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -579,6 +592,7 @@
reagent_state = LIQUID
color = "#60A584"
metabolization_rate = 1
taste_mult = 0
/datum/reagent/neurotoxin2/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -643,6 +657,7 @@
color = "#B0B0B0"
metabolization_rate = 0.3
penetrates_skin = TRUE
taste_description = "prickliness"
/datum/reagent/itching_powder/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_STAT
@@ -800,6 +815,7 @@
reagent_state = LIQUID
color = "#6BA688"
metabolization_rate = 0.1
taste_mult = 0
/datum/reagent/sulfonal/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -865,6 +881,7 @@
color = "#C2D8CD"
metabolization_rate = 0.05
can_synth = FALSE
taste_mult = 0
/datum/reagent/coniine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -880,6 +897,7 @@
color = "#191919"
metabolization_rate = 0.1
penetrates_skin = TRUE
taste_mult = 0
/datum/reagent/curare/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -913,6 +931,7 @@
reagent_state = LIQUID
color = "#C8C8C8" //RGB: 200, 200, 200
metabolization_rate = 0.2 * REAGENTS_METABOLISM
taste_mult = 0
/datum/reagent/heparin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -987,6 +1006,7 @@
reagent_state = LIQUID
color = "#d3cf50"
var/lethality = 0 //Glyphosate is non-toxic to people
taste_description = "bitterness"
/datum/reagent/glyphosate/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1039,6 +1059,7 @@
id = "pestkiller"
description = "A harmful toxic mixture to kill pests. Do not ingest!"
color = "#4B004B" // rgb: 75, 0, 75
taste_description = "bitterness"
/datum/reagent/pestkiller/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1119,6 +1140,7 @@
description = "A filthy, carcinogenic sludge produced by the Slurrypod plant."
reagent_state = LIQUID
color = "#00C81E"
taste_description = "slime"
/datum/reagent/toxic_slurry/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1137,6 +1159,7 @@
description = "This is probably not good for you."
reagent_state = LIQUID
color = "#00FD00"
taste_description = "slime"
/datum/reagent/glowing_slurry/reaction_mob(mob/living/M, method=TOUCH, volume) //same as mutagen
if(!..())
code/modules/reagents/chemistry/reagents/water.dm
+2 -2
View File
@@ -250,7 +250,7 @@
description = "Filthy water scoured from a nasty toilet bowl. Absolutely disgusting."
reagent_state = LIQUID
color = "#757547"
taste_description = "puke"
taste_description = "the inside of a toilet... or worse"
/datum/reagent/fishwater/toiletwater/reaction_mob(mob/living/M, method=TOUCH, volume) //For shennanigans
return
@@ -395,7 +395,7 @@
process_flags = ORGANIC | SYNTHETIC //Admin-bus has no brakes! KILL THEM ALL.
metabolization_rate = 1
can_synth = FALSE
taste_description = "admin abuse"
taste_description = "burning"
/datum/reagent/hellwater/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
code/modules/reagents/reagent_containers/hypospray.dm
+4 -4
View File
@@ -82,12 +82,12 @@
/obj/item/reagent_containers/hypospray/combat
name = "combat stimulant injector"
desc = "A modified air-needle autoinjector, used by support operatives to quickly heal injuries in combat."
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(10)
amount_per_transfer_from_this = 15
possible_transfer_amounts = list(15)
icon_state = "combat_hypo"
volume = 75
volume = 90
ignore_flags = 1 // So they can heal their comrades.
list_reagents = list("epinephrine" = 30, "omnizine" = 30, "teporone" = 15)
list_reagents = list("epinephrine" = 30, "weak_omnizine" = 30, "salglu_solution" = 30)
/obj/item/reagent_containers/hypospray/combat/nanites
desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with expensive medical nanites for rapid healing."
code/modules/reagents/reagent_containers/patch.dm
+2 -2
View File
@@ -28,8 +28,8 @@
list_reagents = list("silver_sulfadiazine" = 40)
/obj/item/reagent_containers/food/pill/patch/synthflesh
name = "syntheflesh patch"
desc = "Helps with burn injuries."
name = "synthflesh patch"
desc = "Helps with brute and burn injuries."
icon_state = "bandaid_med"
instant_application = 1
list_reagents = list("synthflesh" = 20)