shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

work

Browse Source
This commit is contained in:
Ghommie
2019-12-25 06:54:44 +01:00
parent 53d142b4c0
commit 57cecd2499
42 changed files with 142 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/recipes/drugs.dm
+4 -4
View File
@@ -2,7 +2,7 @@
name = "Space Drugs"
id = "space_drugs"
results = list(/datum/reagent/drug/space_drugs = 3)
required_reagents = list("mercury" = 1, /datum/reagent/consumable/sugar = 1, "lithium" = 1)
required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/consumable/sugar = 1, "lithium" = 1)
/datum/chemical_reaction/crank
name = "Crank"
@@ -17,7 +17,7 @@
name = "Krokodil"
id = "krokodil"
results = list("krokodil" = 6)
required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, /datum/reagent/fuel = 1)
required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, /datum/reagent/potassium = 1, "phosphorus" = 1, /datum/reagent/fuel = 1)
mix_message = "The mixture dries into a pale blue powder."
required_temp = 380
@@ -25,14 +25,14 @@
name = "methamphetamine"
id = "methamphetamine"
results = list("methamphetamine" = 4)
required_reagents = list("ephedrine" = 1, "iodine" = 1, "phosphorus" = 1, "hydrogen" = 1)
required_reagents = list("ephedrine" = 1, /datum/reagent/iodine = 1, "phosphorus" = 1, /datum/reagent/hydrogen = 1)
required_temp = 374
/datum/chemical_reaction/bath_salts
name = "bath_salts"
id = "bath_salts"
results = list("bath_salts" = 7)
required_reagents = list("bad_food" = 1, "saltpetre" = 1, /datum/reagent/consumable/nutriment = 1, "cleaner" = 1, /datum/reagent/consumable/enzyme = 1, "tea" = 1, "mercury" = 1)
required_reagents = list("bad_food" = 1, "saltpetre" = 1, /datum/reagent/consumable/nutriment = 1, "cleaner" = 1, /datum/reagent/consumable/enzyme = 1, "tea" = 1, /datum/reagent/mercury = 1)
required_temp = 374
/datum/chemical_reaction/aranesp
code/modules/reagents/chemistry/recipes/medicine.dm
+20 -20
View File
@@ -3,7 +3,7 @@
name = "Leporazine"
id = "leporazine"
results = list("leporazine" = 2)
required_reagents = list("silicon" = 1, "copper" = 1)
required_reagents = list(/datum/reagent/silicon = 1, "copper" = 1)
required_catalysts = list(/datum/reagent/toxin/plasma = 5)
/datum/chemical_reaction/rezadone
@@ -42,7 +42,7 @@
name = "Silver Sulfadiazine"
id = "silver_sulfadiazine"
results = list("silver_sulfadiazine" = 5)
required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, "sulfur" = 1, "oxygen" = 1, "chlorine" = 1)
required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, "sulfur" = 1, /datum/reagent/oxygen = 1, /datum/reagent/chlorine = 1)
/datum/chemical_reaction/salglu_solution
name = "Saline-Glucose Solution"
@@ -110,27 +110,27 @@
name = "Styptic Powder"
id = "styptic_powder"
results = list("styptic_powder" = 4)
required_reagents = list("aluminium" = 1, "hydrogen" = 1, "oxygen" = 1, /datum/reagent/toxin/acid = 1)
required_reagents = list("aluminium" = 1, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1, /datum/reagent/toxin/acid = 1)
mix_message = "The solution yields an astringent powder."
/datum/chemical_reaction/calomel
name = "Calomel"
id = "calomel"
results = list("calomel" = 2)
required_reagents = list("mercury" = 1, "chlorine" = 1)
required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/chlorine = 1)
required_temp = 374
/datum/chemical_reaction/potass_iodide
name = "Potassium Iodide"
id = "potass_iodide"
results = list("potass_iodide" = 2)
required_reagents = list("potassium" = 1, "iodine" = 1)
required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/iodine = 1)
/datum/chemical_reaction/pen_acid
name = "Pentetic Acid"
id = "pen_acid"
results = list("pen_acid" = 6)
required_reagents = list(/datum/reagent/fuel = 1, "chlorine" = 1, /datum/reagent/ammonia = 1, "formaldehyde" = 1, "sodium" = 1, /datum/reagent/toxin/cyanide = 1)
required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/chlorine = 1, /datum/reagent/ammonia = 1, "formaldehyde" = 1, /datum/reagent/sodium = 1, /datum/reagent/toxin/cyanide = 1)
/datum/chemical_reaction/pen_jelly
name = "Pentetic Jelly"
@@ -142,13 +142,13 @@
name = "Salicyclic Acid"
id = "sal_acid"
results = list("sal_acid" = 5)
required_reagents = list("sodium" = 1, /datum/reagent/phenol = 1, /datum/reagent/carbon = 1, "oxygen" = 1, /datum/reagent/toxin/acid = 1)
required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/phenol = 1, /datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/toxin/acid = 1)
/datum/chemical_reaction/oxandrolone
name = "Oxandrolone"
id = "oxandrolone"
results = list("oxandrolone" = 6)
required_reagents = list(/datum/reagent/carbon = 3, /datum/reagent/phenol = 1, "hydrogen" = 1, "oxygen" = 1)
required_reagents = list(/datum/reagent/carbon = 3, /datum/reagent/phenol = 1, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1)
/datum/chemical_reaction/salbutamol
name = "Salbutamol"
@@ -160,7 +160,7 @@
name = "Perfluorodecalin"
id = "perfluorodecalin"
results = list("perfluorodecalin" = 3)
required_reagents = list("hydrogen" = 1, "fluorine" = 1, /datum/reagent/oil = 1)
required_reagents = list(/datum/reagent/hydrogen = 1, /datum/reagent/fluorine = 1, /datum/reagent/oil = 1)
required_temp = 370
mix_message = "The mixture rapidly turns into a dense pink liquid."
@@ -168,7 +168,7 @@
name = "Ephedrine"
id = "ephedrine"
results = list("ephedrine" = 4)
required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/oil = 1, "hydrogen" = 1, "diethylamine" = 1)
required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/oil = 1, /datum/reagent/hydrogen = 1, "diethylamine" = 1)
mix_message = "The solution fizzes and gives off toxic fumes."
/datum/chemical_reaction/diphenhydramine
@@ -182,7 +182,7 @@
name = "Oculine"
id = "oculine"
results = list("oculine" = 3)
required_reagents = list("charcoal" = 1, /datum/reagent/carbon = 1, "hydrogen" = 1)
required_reagents = list("charcoal" = 1, /datum/reagent/carbon = 1, /datum/reagent/hydrogen = 1)
mix_message = "The mixture sputters loudly and becomes a pale pink color."
/datum/chemical_reaction/atropine
@@ -195,7 +195,7 @@
name = "Epinephrine"
id = "epinephrine"
results = list("epinephrine" = 6)
required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/acetone = 1, "diethylamine" = 1, "oxygen" = 1, "chlorine" = 1, "hydrogen" = 1)
required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/acetone = 1, "diethylamine" = 1, /datum/reagent/oxygen = 1, /datum/reagent/chlorine = 1, /datum/reagent/hydrogen = 1)
/datum/chemical_reaction/strange_reagent
name = "Strange Reagent"
@@ -207,7 +207,7 @@
name = "Mannitol"
id = "mannitol"
results = list("mannitol" = 3)
required_reagents = list(/datum/reagent/consumable/sugar = 1, "hydrogen" = 1, "water" = 1)
required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/hydrogen = 1, "water" = 1)
mix_message = "The solution slightly bubbles, becoming thicker."
/datum/chemical_reaction/mutadone
@@ -220,7 +220,7 @@
name = "Neurine"
id = "neurine"
results = list("neurine" = 3)
required_reagents = list("mannitol" = 1, /datum/reagent/acetone = 1, "oxygen" = 1)
required_reagents = list("mannitol" = 1, /datum/reagent/acetone = 1, /datum/reagent/oxygen = 1)
/datum/chemical_reaction/antihol
name = "antihol"
@@ -244,32 +244,32 @@
name = "Clonexadone"
id = "clonexadone"
results = list("clonexadone" = 2)
required_reagents = list("cryoxadone" = 1, "sodium" = 1)
required_reagents = list("cryoxadone" = 1, /datum/reagent/sodium = 1)
required_catalysts = list(/datum/reagent/toxin/plasma = 5)
/datum/chemical_reaction/haloperidol
name = "Haloperidol"
id = "haloperidol"
results = list("haloperidol" = 5)
required_reagents = list("chlorine" = 1, "fluorine" = 1, "aluminium" = 1, "potass_iodide" = 1, /datum/reagent/oil = 1)
required_reagents = list(/datum/reagent/chlorine = 1, /datum/reagent/fluorine = 1, "aluminium" = 1, "potass_iodide" = 1, /datum/reagent/oil = 1)
/datum/chemical_reaction/bicaridine
name = "Bicaridine"
id = "bicaridine"
results = list("bicaridine" = 3)
required_reagents = list(/datum/reagent/carbon = 1, "oxygen" = 1, /datum/reagent/consumable/sugar = 1)
required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/kelotane
name = "Kelotane"
id = "kelotane"
results = list("kelotane" = 2)
required_reagents = list(/datum/reagent/carbon = 1, "silicon" = 1)
required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/silicon = 1)
/datum/chemical_reaction/antitoxin
name = "Antitoxin"
id = "antitoxin"
results = list("antitoxin" = 3)
required_reagents = list("nitrogen" = 1, "silicon" = 1, "potassium" = 1)
required_reagents = list(/datum/reagent/nitrogen = 1, /datum/reagent/silicon = 1, /datum/reagent/potassium = 1)
/datum/chemical_reaction/tricordrazine
name = "Tricordrazine"
@@ -299,7 +299,7 @@
name = "Morphine"
id = "morphine"
results = list("morphine" = 2)
required_reagents = list(/datum/reagent/carbon = 2, "hydrogen" = 2, /datum/reagent/consumable/ethanol = 1, "oxygen" = 1)
required_reagents = list(/datum/reagent/carbon = 2, /datum/reagent/hydrogen = 2, /datum/reagent/consumable/ethanol = 1, /datum/reagent/oxygen = 1)
required_temp = 480
/datum/chemical_reaction/modafinil
code/modules/reagents/chemistry/recipes/others.dm
+20 -20
View File
@@ -3,13 +3,13 @@
name = "Sterilizine"
id = "sterilizine"
results = list("sterilizine" = 3)
required_reagents = list(/datum/reagent/consumable/ethanol = 1, "charcoal" = 1, "chlorine" = 1)
required_reagents = list(/datum/reagent/consumable/ethanol = 1, "charcoal" = 1, /datum/reagent/chlorine = 1)
/datum/chemical_reaction/lube
name = "Space Lube"
id = "lube"
results = list("lube" = 4)
required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
required_reagents = list("water" = 1, /datum/reagent/silicon = 1, /datum/reagent/oxygen = 1)
/datum/chemical_reaction/spraytan
name = "Spray Tan"
@@ -27,13 +27,13 @@
name = "Impedrezene"
id = "impedrezene"
results = list("impedrezene" = 2)
required_reagents = list("mercury" = 1, "oxygen" = 1, /datum/reagent/consumable/sugar = 1)
required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/oxygen = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/cryptobiolin
name = "Cryptobiolin"
id = "cryptobiolin"
results = list("cryptobiolin" = 3)
required_reagents = list("potassium" = 1, "oxygen" = 1, /datum/reagent/consumable/sugar = 1)
required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/oxygen = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/glycerol
name = "Glycerol"
@@ -45,12 +45,12 @@
name = "Sodium Chloride"
id = "sodiumchloride"
results = list(/datum/reagent/consumable/sodiumchloride = 3)
required_reagents = list("water" = 1, "sodium" = 1, "chlorine" = 1)
required_reagents = list("water" = 1, /datum/reagent/sodium = 1, /datum/reagent/chlorine = 1)
/datum/chemical_reaction/plasmasolidification
name = "Solid Plasma"
id = "solidplasma"
required_reagents = list(/datum/reagent/iron = 5, "frostoil" = 5, /datum/reagent/toxin/plasma = 20)
required_reagents = list(/datum/reagent/iron = 5, /datum/reagent/consumable/frostoil = 5, /datum/reagent/toxin/plasma = 20)
mob_react = FALSE
/datum/chemical_reaction/plasmasolidification/on_reaction(datum/reagents/holder, created_volume)
@@ -61,7 +61,7 @@
/datum/chemical_reaction/goldsolidification
name = "Solid Gold"
id = "solidgold"
required_reagents = list("frostoil" = 5, /datum/reagent/gold = 20, /datum/reagent/iron = 1)
required_reagents = list(/datum/reagent/consumable/frostoil = 5, /datum/reagent/gold = 20, /datum/reagent/iron = 1)
mob_react = FALSE
/datum/chemical_reaction/goldsolidification/on_reaction(datum/reagents/holder, created_volume)
@@ -73,7 +73,7 @@
name = "Capsaicincondensation"
id = "capsaicincondensation"
results = list("condensedcapsaicin" = 5)
required_reagents = list("capsaicin" = 1, /datum/reagent/consumable/ethanol = 5)
required_reagents = list(/datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/ethanol = 5)
/datum/chemical_reaction/soapification
name = "Soapification"
@@ -96,7 +96,7 @@
/datum/chemical_reaction/candlefication
name = "Candlefication"
id = "candlefication"
required_reagents = list("liquidgibs" = 5, "oxygen" = 5) //
required_reagents = list("liquidgibs" = 5, /datum/reagent/oxygen = 5) //
required_temp = 374
mob_react = FALSE
@@ -121,14 +121,14 @@
name = "Direct Carbon Oxidation"
id = "burningcarbon"
results = list("co2" = 3)
required_reagents = list(/datum/reagent/carbon = 1, "oxygen" = 2)
required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 2)
required_temp = 777 // pure carbon isn't especially reactive.
/datum/chemical_reaction/nitrous_oxide
name = "Nitrous Oxide"
id = "nitrous_oxide"
results = list("nitrous_oxide" = 5)
required_reagents = list(/datum/reagent/ammonia = 2, "nitrogen" = 1, "oxygen" = 2)
required_reagents = list(/datum/reagent/ammonia = 2, /datum/reagent/nitrogen = 1, /datum/reagent/oxygen = 2)
required_temp = 525
//Technically a mutation toxin
@@ -363,7 +363,7 @@
name = "Foam surfactant"
id = "foam surfactant"
results = list("fluorosurfactant" = 5)
required_reagents = list("fluorine" = 2, /datum/reagent/carbon = 2, /datum/reagent/toxin/acid = 1)
required_reagents = list(/datum/reagent/fluorine = 2, /datum/reagent/carbon = 2, /datum/reagent/toxin/acid = 1)
/datum/chemical_reaction/foam
name = "Foam"
@@ -432,7 +432,7 @@
name = "Foaming Agent"
id = "foaming_agent"
results = list("foaming_agent" = 1)
required_reagents = list("lithium" = 1, "hydrogen" = 1)
required_reagents = list("lithium" = 1, /datum/reagent/hydrogen = 1)
/datum/chemical_reaction/smart_foaming_agent
name = "Smart foaming Agent"
@@ -448,7 +448,7 @@
name = "Ammonia"
id = "ammonia"
results = list(/datum/reagent/ammonia = 3)
required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
required_reagents = list(/datum/reagent/hydrogen = 3, /datum/reagent/nitrogen = 1)
/datum/chemical_reaction/diethylamine
name = "Diethylamine"
@@ -484,7 +484,7 @@
name = "Drying agent"
id = "drying_agent"
results = list("drying_agent" = 3)
required_reagents = list("stable_plasma" = 2, /datum/reagent/consumable/ethanol = 1, "sodium" = 1)
required_reagents = list("stable_plasma" = 2, /datum/reagent/consumable/ethanol = 1, /datum/reagent/sodium = 1)
//////////////////////////////////// Other goon stuff ///////////////////////////////////////////
@@ -492,19 +492,19 @@
name = "acetone"
id = "acetone"
results = list(/datum/reagent/acetone = 3)
required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/fuel = 1, "oxygen" = 1)
required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/fuel = 1, /datum/reagent/oxygen = 1)
/datum/chemical_reaction/oil
name = "Oil"
id = "oil"
results = list(/datum/reagent/oil = 3)
required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/carbon = 1, "hydrogen" = 1)
required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/carbon = 1, /datum/reagent/hydrogen = 1)
/datum/chemical_reaction/phenol
name = "phenol"
id = "phenol"
results = list(/datum/reagent/phenol = 3)
required_reagents = list("water" = 1, "chlorine" = 1, /datum/reagent/oil = 1)
required_reagents = list("water" = 1, /datum/reagent/chlorine = 1, /datum/reagent/oil = 1)
/datum/chemical_reaction/ash
name = "Ash"
@@ -572,13 +572,13 @@
name = "saltpetre"
id = "saltpetre"
results = list("saltpetre" = 3)
required_reagents = list("potassium" = 1, "nitrogen" = 1, "oxygen" = 3)
required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/nitrogen = 1, /datum/reagent/oxygen = 3)
/datum/chemical_reaction/lye
name = "lye"
id = "lye"
results = list("lye" = 3)
required_reagents = list("sodium" = 1, "hydrogen" = 1, "oxygen" = 1)
required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1)
/datum/chemical_reaction/lye2
name = "lye"
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+13 -13
View File
@@ -49,13 +49,13 @@
/datum/chemical_reaction/reagent_explosion/potassium_explosion
name = "Explosion"
id = "potassium_explosion"
required_reagents = list("water" = 1, "potassium" = 1)
required_reagents = list("water" = 1, /datum/reagent/potassium = 1)
strengthdiv = 10
/datum/chemical_reaction/reagent_explosion/potassium_explosion/holyboom
name = "Holy Explosion"
id = "holyboom"
required_reagents = list("holywater" = 1, "potassium" = 1)
required_reagents = list("holywater" = 1, /datum/reagent/potassium = 1)
/datum/chemical_reaction/reagent_explosion/potassium_explosion/holyboom/on_reaction(datum/reagents/holder, created_volume)
var/turf/T = get_turf(holder.my_atom)
@@ -105,7 +105,7 @@
name = "Thermite"
id = "thermite"
results = list("thermite" = 3)
required_reagents = list("aluminium" = 1, /datum/reagent/iron = 1, "oxygen" = 1)
required_reagents = list("aluminium" = 1, /datum/reagent/iron = 1, /datum/reagent/oxygen = 1)
/datum/chemical_reaction/emp_pulse
name = "EMP Pulse"
@@ -148,13 +148,13 @@
name = "stabilizing_agent"
id = "stabilizing_agent"
results = list("stabilizing_agent" = 3)
required_reagents = list(/datum/reagent/iron = 1, "oxygen" = 1, "hydrogen" = 1)
required_reagents = list(/datum/reagent/iron = 1, /datum/reagent/oxygen = 1, /datum/reagent/hydrogen = 1)
/datum/chemical_reaction/clf3
name = "Chlorine Trifluoride"
id = "clf3"
results = list("clf3" = 4)
required_reagents = list("chlorine" = 1, "fluorine" = 3)
required_reagents = list(/datum/reagent/chlorine = 1, /datum/reagent/fluorine = 3)
required_temp = 424
/datum/chemical_reaction/clf3/on_reaction(datum/reagents/holder, created_volume)
@@ -181,14 +181,14 @@
/datum/chemical_reaction/reagent_explosion/methsplosion/methboom2
id = "methboom2"
required_reagents = list("diethylamine" = 1, "iodine" = 1, "phosphorus" = 1, "hydrogen" = 1) //diethylamine is often left over from mixing the ephedrine.
required_reagents = list("diethylamine" = 1, /datum/reagent/iodine = 1, "phosphorus" = 1, /datum/reagent/hydrogen = 1) //diethylamine is often left over from mixing the ephedrine.
required_temp = 300 //room temperature, chilling it even a little will prevent the explosion
/datum/chemical_reaction/sorium
name = "Sorium"
id = "sorium"
results = list("sorium" = 4)
required_reagents = list("mercury" = 1, "oxygen" = 1, "nitrogen" = 1, /datum/reagent/carbon = 1)
required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/oxygen = 1, /datum/reagent/nitrogen = 1, /datum/reagent/carbon = 1)
/datum/chemical_reaction/sorium/on_reaction(datum/reagents/holder, created_volume)
if(holder.has_reagent(/datum/reagent/stabilizing_agent))
@@ -238,7 +238,7 @@
name = "Flash powder"
id = "flash_powder"
results = list("flash_powder" = 3)
required_reagents = list("aluminium" = 1, "potassium" = 1, "sulfur" = 1 )
required_reagents = list("aluminium" = 1, /datum/reagent/potassium = 1, "sulfur" = 1 )
/datum/chemical_reaction/flash_powder/on_reaction(datum/reagents/holder, created_volume)
if(holder.has_reagent(/datum/reagent/stabilizing_agent))
@@ -281,7 +281,7 @@
name = "smoke_powder"
id = "smoke_powder"
results = list("smoke_powder" = 3)
required_reagents = list("potassium" = 1, /datum/reagent/consumable/sugar = 1, "phosphorus" = 1)
required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/consumable/sugar = 1, "phosphorus" = 1)
/datum/chemical_reaction/smoke_powder/on_reaction(datum/reagents/holder, created_volume)
if(holder.has_reagent(/datum/reagent/stabilizing_agent))
@@ -321,7 +321,7 @@
name = "sonic_powder"
id = "sonic_powder"
results = list("sonic_powder" = 3)
required_reagents = list("oxygen" = 1, "cola" = 1, "phosphorus" = 1)
required_reagents = list(/datum/reagent/oxygen = 1, /datum/reagent/consumable/space_cola = 1, "phosphorus" = 1)
/datum/chemical_reaction/sonic_powder/on_reaction(datum/reagents/holder, created_volume)
if(holder.has_reagent(/datum/reagent/stabilizing_agent))
@@ -369,7 +369,7 @@
name = "cryostylane"
id = "cryostylane"
results = list("cryostylane" = 3)
required_reagents = list("water" = 1, "stable_plasma" = 1, "nitrogen" = 1)
required_reagents = list("water" = 1, "stable_plasma" = 1, /datum/reagent/nitrogen = 1)
/datum/chemical_reaction/cryostylane/on_reaction(datum/reagents/holder, created_volume)
holder.chem_temp = 20 // cools the fuck down
@@ -379,7 +379,7 @@
name = "ephemeral cryostylane reaction"
id = "cryostylane_oxygen"
results = list("cryostylane" = 1)
required_reagents = list("cryostylane" = 1, "oxygen" = 1)
required_reagents = list("cryostylane" = 1, /datum/reagent/oxygen = 1)
mob_react = FALSE
/datum/chemical_reaction/cryostylane_oxygen/on_reaction(datum/reagents/holder, created_volume)
@@ -389,7 +389,7 @@
name = "ephemeral pyrosium reaction"
id = "pyrosium_oxygen"
results = list("pyrosium" = 1)
required_reagents = list("pyrosium" = 1, "oxygen" = 1)
required_reagents = list("pyrosium" = 1, /datum/reagent/oxygen = 1)
mob_react = FALSE
/datum/chemical_reaction/pyrosium_oxygen/on_reaction(datum/reagents/holder, created_volume)
code/modules/reagents/chemistry/recipes/toxins.dm
+9 -9
View File
@@ -3,7 +3,7 @@
name = "formaldehyde"
id = "Formaldehyde"
results = list("formaldehyde" = 3)
required_reagents = list(/datum/reagent/consumable/ethanol = 1, "oxygen" = 1, /datum/reagent/silver = 1)
required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/oxygen = 1, /datum/reagent/silver = 1)
required_temp = 420
/datum/chemical_reaction/fentanyl
@@ -17,7 +17,7 @@
name = "Cyanide"
id = "cyanide"
results = list(/datum/reagent/toxin/cyanide = 3)
required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/ammonia = 1, "oxygen" = 1)
required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/ammonia = 1, /datum/reagent/oxygen = 1)
required_temp = 380
/datum/chemical_reaction/itching_powder
@@ -30,7 +30,7 @@
name = "Fluorosulfuric acid"
id = "facid"
results = list(/datum/reagent/toxin/acid/fluacid = 4)
required_reagents = list(/datum/reagent/toxin/acid = 1, "fluorine" = 1, "hydrogen" = 1, "potassium" = 1)
required_reagents = list(/datum/reagent/toxin/acid = 1, /datum/reagent/fluorine = 1, /datum/reagent/hydrogen = 1, /datum/reagent/potassium = 1)
required_temp = 380
/datum/chemical_reaction/sulfonal
@@ -43,25 +43,25 @@
name = "lipolicide"
id = "lipolicide"
results = list("lipolicide" = 3)
required_reagents = list("mercury" = 1, "diethylamine" = 1, "ephedrine" = 1)
required_reagents = list(/datum/reagent/mercury = 1, "diethylamine" = 1, "ephedrine" = 1)
/datum/chemical_reaction/mutagen
name = "Unstable mutagen"
id = "mutagen"
results = list("mutagen" = 3)
required_reagents = list(/datum/reagent/radium = 1, "phosphorus" = 1, "chlorine" = 1)
required_reagents = list(/datum/reagent/radium = 1, "phosphorus" = 1, /datum/reagent/chlorine = 1)
/datum/chemical_reaction/lexorin
name = "Lexorin"
id = "lexorin"
results = list("lexorin" = 3)
required_reagents = list(/datum/reagent/toxin/plasma = 1, "hydrogen" = 1, "oxygen" = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1)
/datum/chemical_reaction/chloralhydrate
name = "Chloral Hydrate"
id = "chloralhydrate"
results = list("chloralhydrate" = 1)
required_reagents = list(/datum/reagent/consumable/ethanol = 1, "chlorine" = 3, "water" = 1)
required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/chlorine = 3, "water" = 1)
/datum/chemical_reaction/mutetoxin //i'll just fit this in here snugly between other unfun chemicals :v
name = "Mute Toxin"
@@ -85,13 +85,13 @@
name = "Mindbreaker Toxin"
id = "mindbreaker"
results = list("mindbreaker" = 5)
required_reagents = list("silicon" = 1, "hydrogen" = 1, "charcoal" = 1)
required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/hydrogen = 1, "charcoal" = 1)
/datum/chemical_reaction/heparin
name = "Heparin"
id = "Heparin"
results = list("heparin" = 4)
required_reagents = list("formaldehyde" = 1, "sodium" = 1, "chlorine" = 1, "lithium" = 1)
required_reagents = list("formaldehyde" = 1, /datum/reagent/sodium = 1, /datum/reagent/chlorine = 1, "lithium" = 1)
mix_message = "<span class='danger'>The mixture thins and loses all color.</span>"
/datum/chemical_reaction/rotatium
code/modules/reagents/reagent_containers/bottle.dm
+12 -12
View File
@@ -127,12 +127,12 @@
/obj/item/reagent_containers/glass/bottle/capsaicin
name = "Capsaicin Bottle"
desc = "A small bottle. Contains hot sauce."
list_reagents = list("capsaicin" = 30)
list_reagents = list(/datum/reagent/consumable/capsaicin = 30)
/obj/item/reagent_containers/glass/bottle/frostoil
name = "Frost Oil Bottle"
desc = "A small bottle. Contains cold sauce."
list_reagents = list("frostoil" = 30)
list_reagents = list(/datum/reagent/consumable/frostoil = 30)
/obj/item/reagent_containers/glass/bottle/traitor
name = "syndicate bottle"
@@ -313,7 +313,7 @@
/obj/item/reagent_containers/glass/bottle/hydrogen
name = "hydrogen bottle"
list_reagents = list("hydrogen" = 30)
list_reagents = list(/datum/reagent/hydrogen = 30)
/obj/item/reagent_containers/glass/bottle/lithium
name = "lithium bottle"
@@ -325,19 +325,19 @@
/obj/item/reagent_containers/glass/bottle/nitrogen
name = "nitrogen bottle"
list_reagents = list("nitrogen" = 30)
list_reagents = list(/datum/reagent/nitrogen = 30)
/obj/item/reagent_containers/glass/bottle/oxygen
name = "oxygen bottle"
list_reagents = list("oxygen" = 30)
list_reagents = list(/datum/reagent/oxygen = 30)
/obj/item/reagent_containers/glass/bottle/fluorine
name = "fluorine bottle"
list_reagents = list("fluorine" = 30)
list_reagents = list(/datum/reagent/fluorine = 30)
/obj/item/reagent_containers/glass/bottle/sodium
name = "sodium bottle"
list_reagents = list("sodium" = 30)
list_reagents = list(/datum/reagent/sodium = 30)
/obj/item/reagent_containers/glass/bottle/aluminium
name = "aluminium bottle"
@@ -345,7 +345,7 @@
/obj/item/reagent_containers/glass/bottle/silicon
name = "silicon bottle"
list_reagents = list("silicon" = 30)
list_reagents = list(/datum/reagent/silicon = 30)
/obj/item/reagent_containers/glass/bottle/phosphorus
name = "phosphorus bottle"
@@ -357,11 +357,11 @@
/obj/item/reagent_containers/glass/bottle/chlorine
name = "chlorine bottle"
list_reagents = list("chlorine" = 30)
list_reagents = list(/datum/reagent/chlorine = 30)
/obj/item/reagent_containers/glass/bottle/potassium
name = "potassium bottle"
list_reagents = list("potassium" = 30)
list_reagents = list(/datum/reagent/potassium = 30)
/obj/item/reagent_containers/glass/bottle/iron
name = "iron bottle"
@@ -373,7 +373,7 @@
/obj/item/reagent_containers/glass/bottle/mercury
name = "mercury bottle"
list_reagents = list("mercury" = 30)
list_reagents = list(/datum/reagent/mercury = 30)
/obj/item/reagent_containers/glass/bottle/radium
name = "radium bottle"
@@ -405,7 +405,7 @@
/obj/item/reagent_containers/glass/bottle/iodine
name = "iodine bottle"
list_reagents = list("iodine" = 30)
list_reagents = list(/datum/reagent/iodine = 30)
/obj/item/reagent_containers/glass/bottle/bromine
name = "bromine bottle"
code/modules/reagents/reagent_containers/glass.dm
+1 -1
View File
@@ -335,7 +335,7 @@
icon = 'icons/obj/drinks.dmi'
icon_state = "smallbottle"
item_state = "bottle"
list_reagents = list(/datum/reagent/water = 49.5, "fluorine" = 0.5)//see desc, don't think about it too hard
list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard
materials = list(MAT_GLASS=0)
volume = 50
amount_per_transfer_from_this = 10