some moire

This commit is contained in:
Kashargul
2024-12-06 21:54:05 +01:00
parent 80edcd2c3d
commit 429398bdd7
231 changed files with 2484 additions and 1945 deletions
+2 -2
View File
@@ -49,8 +49,8 @@
#define ANTIBIO_SUPER 3
// Chemistry lists.
var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") // Increase heart rate.
var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "bliss", "stoxin", "ambrosia_extract") // Decrease heart rate.
var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", REAGENT_ID_NICOTINE) // Increase heart rate.
var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", REAGENT_ID_BLISS, "stoxin", REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate.
var/list/heartstopper = list("potassium_chlorophoride", "zombiepowder") // This stops the heart.
var/list/cheartstopper = list("potassium_chloride") // This stops the heart when overdose is met. -- c = conditional
+590 -58
View File
@@ -15,29 +15,347 @@
#define REAGENT_OXYGEN "Oxygen"
#define REAGENT_ID_OXYGEN "oxygen"
#define REAGENT_VOLATILE_FUEL "Volatile Fuel"
#define REAGENT_HYDROGEN "Hydrogen"
#define REAGENT_ID_HYDROGEN "hydrogen"
#define REAGENT_FLUORINE "Fluorine"
#define REAGENT_ID_FLUORINE "fluorine"
#define REAGENT_CHLORINE "Chlorine"
#define REAGENT_ID_CHLORINE "chlorine"
// Fluid Reagents
#define REAGENT_ETHANOL "Ethanol"
#define REAGENT_ID_ETHANOL "ethanol"
#define REAGENT_SACID "Sulphuric acid"
#define REAGENT_ID_SACID "sacid"
#define REAGENT_BLOOD "Blood"
#define REAGENT_ID_BLOOD "blood"
#define REAGENT_SYNTHBLOOD "synthetic blood"
#define REAGENT_ID_SYNTHBLOOD "synthblood"
#define REAGENT_SYNTHBLOOD_DILUTE "synthetic plasma"
#define REAGENT_ID_SYNTHBLOOD_DILUTE "synthblood_dilute"
#define REAGENT_ANTIBODIES "Antibodies"
#define REAGENT_ID_ANTIBODIES "antibodies"
#define REAGENT_WATER "Water"
#define REAGENT_ID_WATER "water"
#define REAGENT_PACID "pacid"
#define REAGENT_FUEL "Welding fuel"
#define REAGENT_ID_FUEL "fuel"
// Solid Reagents
#define REAGENT_IRON "Iron"
#define REAGENT_ID_IRON "iron"
#define REAGENT_LITHIUM "Lithium"
#define REAGENT_ID_LITHIUM "lithium"
#define REAGENT_ALUMINIUM "Aluminum"
#define REAGENT_ID_ALUMINIUM "aluminum"
#define REAGENT_CALCIUM "Calcium"
#define REAGENT_ID_CALCIUM "calcium"
#define REAGENT_CARBON "Carbon"
#define REAGENT_ID_CARBON "carbon"
#define REAGENT_COPPER "Copper"
#define REAGENT_ID_COPPER "copper"
#define REAGENT_MERCURY "Mercury"
#define REAGENT_ID_MERCURY "mercury"
#define REAGENT_PHOSPHORUS "Phosphorus"
#define REAGENT_ID_PHOSPHORUS "phosphorus"
#define REAGENT_POTASSIUM "Potassium"
#define REAGENT_ID_POTASSIUM "potassium"
#define REAGENT_RADIUM "Radium"
#define REAGENT_ID_RADIUM "radium"
#define REAGENT_SILICON "Silicon"
#define REAGENT_ID_SILICON "silicon"
#define REAGENT_SODIUM "Sodium"
#define REAGENT_ID_SODIUM "sodium"
#define REAGENT_SUGAR "Sugar"
#define REAGENT_ID_SUGAR "sugar"
#define REAGENT_SULFUR "Sulfur"
#define REAGENT_ID_SULFUR "sulfur"
#define REAGENT_TUNGSTEN "Tungsten"
#define REAGENT_ID_TUNGSTEN "tungsten"
#define REAGENT_SODIUMCHLORIDE "Table Salt"
#define REAGENT_ID_SODIUMCHLORIDE "sodiumchloride"
#define REAGENT_NUTRIMENT "Nutriment"
#define REAGENT_ID_NUTRIMENT "nutriment"
// Xeno chem react
#define XENO_CHEM_NUTRI "nutr"
#define XENO_CHEM_MUT "mut"
#define XENO_CHEM_TOXIC "toxic"
#define XENO_CHEM_HEAL "heal"
// Drugs and Chemical reactions
#define REAGENT_SIZEOXADONE "Sizeoxadone"
#define REAGENT_ID_SIZEOXADONE "sizeoxadone"
#define REAGENT_MACROCILLIN "Macrocillin"
#define REAGENT_ID_MACROCILLIN "macrocillin"
#define REAGENT_MICROCILLIN "Microcillin"
#define REAGENT_ID_MICROCILLIN "microcillin"
#define REAGENT_NORMALCILLIN "Normalcillin"
#define REAGENT_ID_NORMALCILLIN "normalcillin"
#define REAGENT_ICKYPAK "Ickypak"
#define REAGENT_ID_ICKYPAK "ickypak"
#define REAGENT_UNSORBITOL "Unsorbitol"
#define REAGENT_ID_UNSORBITOL "unsorbitol"
#define REAGENT_AMORPHOROVIR "Amorphorovir"
#define REAGENT_ID_AMORPHOROVIR "amorphorovir"
#define REAGENT_ANDROROVIR "Androrovir"
#define REAGENT_ID_ANDROROVIR "androrovir"
#define REAGENT_GYNOROVIR "Gynorovir"
#define REAGENT_ID_GYNOROVIR "gynorovir"
#define REAGENT_ANDROGYNOROVIR "Androgynorovir"
#define REAGENT_ID_ANDROGYNOROVIR "androgynorovir"
#define REAGENT_RAINBOWTOXIN "Rainbow Toxin"
#define REAGENT_ID_RAINBOWTOXIN "rainbowtoxin"
#define REAGENT_PARALYSISTOXIN "Tetrodotoxin"
#define REAGENT_ID_PARALYSISTOXIN "paralysistoxin"
#define REAGENT_PAINENZYME "Pain Enzyme"
#define REAGENT_ID_PAINENZYME "painenzyme"
// Drugs
#define REAGENT_DRUGS "generic drugs"
#define REAGENT_ID_DRUGS "drugs"
#define REAGENT_BLISS "Bliss"
#define REAGENT_ID_BLISS "bliss"
#define REAGENT_AMBROSIAEXTRACT "Ambrosia extract"
#define REAGENT_ID_AMBROSIAEXTRACT "ambrosia_extract"
#define REAGENT_PSILOCYBIN "Psilocybin"
#define REAGENT_ID_PSILOCYBIN "psilocybin"
#define REAGENT_TALUMQUEM "Talum-quem"
#define REAGENT_ID_TALUMQUEM "talum_quem"
#define REAGENT_NICOTINE "Nicotine"
#define REAGENT_ID_NICOTINE "nicotine"
#define REAGENT_METHYLPHENIDATE "Methylphenidate"
#define REAGENT_ID_METHYLPHENIDATE "methylphenidate"
#define REAGENT_CITALOPRAM "Citalopram"
#define REAGENT_ID_CITALOPRAM "citalopram"
#define REAGENT_PAROXETINE "Paroxetine"
#define REAGENT_ID_PAROXETINE "paroxetine"
#define REAGENT_QERRQUEM "Qerr-quem"
#define REAGENT_ID_QERRQUEM "qerr_quem"
// Toxins
#define REAGENT_PACID "Polytrinic acid"
#define REAGENT_ID_PACID "pacid"
#define REAGEMT_PHORON "Phoron"
#define REAGENT_ID_PHORON "phoron"
#define REAGENT_SPIDERTOXIN "Spidertoxin"
#define REAGENT_ID_SPIDERTOXIN "spidertoxin"
#define REAGENT_LEAD "Lead"
#define REAGENT_ID_LEAD "lead"
// Food and Drinks
#define REAGENT_MEATCOLONY "A colony of meat cells"
#define REAGENT_ID_MEATCOLONY "meatcolony"
#define REAGENT_PLANTCOLONY "A colony of plant cells"
#define REAGENT_ID_PLANTCOLONY "plantcolony"
#define REAGENT_GRUBSHAKE "Grub shake"
#define REAGENT_ID_GRUBSHAKE "grubshake"
#define REAGENT_BURNOUT "Burnout"
#define REAGENT_ID_BURNOUT "burnout"
#define REAGENT_MONSTERTAMER "Monster Tamer"
#define REAGENT_ID_MONSTERTAMER "monstertamer"
#define REAGENT_PINKRUSSIAN "Pink Russian"
#define REAGENT_ID_PINKRUSSIAN "pinkrussian"
#define REAGENT_ORIGINALSIN "Original Sin"
#define REAGENT_ID_ORIGINALSIN "originalsin"
#define REAGENT_NEWYORKSOUR "New York Sour"
#define REAGENT_ID_NEWYORKSOUR "newyorksour"
#define REAGENT_WINDGARITA "WND-Garita"
#define REAGENT_ID_WINDGARITA "windgarita"
#define REAGENT_MUDSLIDE "Mudslide"
#define REAGENT_ID_MUDSLIDE "mudslide"
#define REAGENT_GALACTICPANIC "Galactic Panic Attack"
#define REAGENT_ID_GALACTICPANIC "galacticpanic"
#define REAGENT_BULLDOG "Space Bulldog"
#define REAGENT_ID_BULLDOG "bulldog"
#define REAGENT_SBAGLIATO "Negroni Sbagliato"
#define REAGENT_ID_SBAGLIATO "sbagliato"
#define REAGENT_ITALIANCRISIS "Italian Crisis"
#define REAGENT_ID_ITALIANCRISIS "italiancrisis"
#define REAGENT_SUGARRUSH "Sweet Rush"
#define REAGENT_ID_SUGARRUSH "sugarrush"
#define REAGENT_LOTUS "Lotus"
#define REAGENT_ID_LOTUS "lotus"
#define REAGENT_SHROOMJUICE "Dumb Shroom Juice"
#define REAGENT_ID_SHROOMJUICE "shroomjuice"
#define REAGENT_RUSSIANROULETTE "Russian Roulette"
#define REAGENT_ID_RUSSIANROULETTE "russianroulette"
#define REAGENT_LOVEMAKER "The Love Maker"
#define REAGENT_ID_LOVEMAKER "lovemaker"
#define REAGENT_HONEYSHOT "Honey Shot"
#define REAGENT_ID_HONEYSHOT "honeyshot"
#define REAGENT_APPLETINI "Appletini"
#define REAGENT_ID_APPLETINIT "appletini"
#define REAGENT_GLOWINGAPPLETINI "Glowing Appletini"
#define REAGENT_ID_GLOWINGAPPLETINI "glowingappletini"
#define REAGENT_SCSATW "Slow Comfortable Screw Against the Wall"
#define REAGENT_ID_SCSATW "scsatw"
#define REAGENT_CHOCCYMILK "Choccy Milk"
#define REAGENT_ID_CHOCCYMILK "choccymilk"
#define REAGENT_REDSPACEFLUSH "Redspace Flush"
#define REAGENT_ID_REDSPACEFLUSH "redspaceflush"
#define REAGENT_GRAVEYARD "Graveyard"
#define REAGENT_ID_GRAVEYARD "graveyard"
#define REAGENT_BIGBEER "Giant Beer"
#define REAGENT_ID_BIGBEER "bigbeer"
#define REAGENT_MANAGERSUMMONER "Manager Summoner"
#define REAGENT_ID_MANAGERSUMMONER "manager_summoner"
#define REAGENT_SWEETTEA "Sweet Tea"
#define REAGENT_ID_SWEETTEA "sweettea"
#define REAGENT_UNSWEETTEA "Unsweetened Tea"
#define REAGENT_ID_UNSWEETTEA "unsweettea"
#define REAGENT_HAIROFTHERAT "Hair of the Rat"
#define REAGENT_ID_HAIROFTHERAT "hairoftherat"
#define REAGENT_BEPIS "Bepis"
#define REAGENT_ID_BEPIS "bepis"
#define REAGENT_BEPIS "Bepis Cola"
#define REAGENT_ID_BEPIS "bepis"
#define REAGENT_BUZZFUZZ "Buzz Fuzz"
#define REAGENT_ID_BUZZFUZZ "buzz_fuzz"
#define REAGENT_SPRITEDCRANBERRY "Sprited Cranberry"
#define REAGENT_ID_SPRITEDCRANBERRY "sprited_cranberry"
#define REAGENT_SHAMBLERS "Shambler's Juice"
#define REAGENT_ID_SHAMBLERS "shamblers"
#define REAGENT_BRAINPROTEIN "grey matter"
#define REAGENT_ID_BRAINPROTEIN "brain_protein"
#define REAGENT_ID_REDBRAINPROTEIN "red_brain_protein"
#define REAGENT_PROTEINPOWDER "Protein Powder"
#define REAGENT_ID_PROTEINPOWDER "protein_powder"
#define REAGENT_PROTEINSHAKE "Protein Shake"
#define REAGENT_ID_PROTEINSHAKE "protein_shake"
#define REAGENT_VANILLAPROTEINPOWDER "Vanilla Protein Powder"
#define REAGENT_ID_VANILLAPROTEINPOWDER "vanilla_protein_powder"
#define REAGENT_VANILLAPROTEINSHAKE "Vanilla Protein Shake"
#define REAGENT_ID_VANILLAPROTEINSHAKER "vanilla_protein_shake"
#define REAGENT_BANANAPROTEINPOWDER "Banana Protein Powder"
#define REAGENT_ID_BANANAPROTEINPOWDER "banana_protein_powder"
#define REAGENT_BANANAPROTEINSHAKE "Banana Protein Shake"
#define REAGENT_ID_BANANAPROTEINSHAKE "banana_protein_shake"
#define REAGENT_CHOCOLATEPROTEINPOWDER "Chocolate Protein Powder"
#define REAGENT_ID_CHOCOLATEPROTEINPOWDER "chocolate_protein_powder"
#define REAGENT_CHOCOLATEPROTEINSHAKE "Chocolate Protein Shake"
#define REAGENT_ID_CHOCOLATEPROTEINSHAKE "chocolate_protein_shake"
#define REAGENT_STRAWBERRYPROTEINPOWDER "Strawberry Protein Powder"
#define REAGENT_ID_STRAWBERRYPROTEINPOWDER "strawberry_protein_powder"
#define REAGENT_STRAWBERRYPROTEINSHAKE "Strawberry Protein Shake"
#define REAGENT_ID_STRAWBERRYPROTEINSHAKE "strawberry_protein_shake"
#define REAGENT_SOUP "Soup
#define REAGENT_ID_SOUP "generic_soup"
#define REAGENT_TOMATOSOUP "Tomato Soup"
#define REAGENT_ID_TOMATOSOUP "tomato_soup"
#define REAGENT_MUSHROOMSOUP "Cream of Mushroom Soup"
#define REAGENT_ID_MUSHROOMSOUP "mushroom_soup"
#define REAGENT_CHICKENSOUP "Cream of Chicken Soup"
#define REAGENT_ID_CHICKENSOUP "chicken_soup"
#define REAGENT_CHICKENNOODLESOUP "Chicken Noodle Soup"
#define REAGENT_ID_CHICKENNOODLESOUP "chicken_noodle_soup"
#define REAGENT_ONIONSOUP "Onion Soup"
#define REAGENT_ID_ONIONSOUP "onion_soup"
#define REAGENT_VEGETABLESOUP "Vegetable Soup"
#define REAGENT_ID_VEGETABLESOUP "vegetable_soup"
#define REAGENT_BEETSOUP "Beet Soup"
#define REAGENT_ID_BEETSOUP "beet_soup"
#define REAGENT_HOTNSOURSOUP "Hot & Sour Soup"
#define REAGENT_ID_HOTNSOURSOUP "hot_n_sour_soup"
#define REAGENT_NUKIE "Nukie"
#define REAGENT_ID_NUKIE "nukie"
#define REAGENT_NUKIEPEACH "Nukie Peach"
#define REAGENT_ID_NUKIEPEACH "nukie_peach"
#define REAGENT_NUKIEPEAR "Nukie Pear"
#define REAGENT_ID_NUKIEPEAR "nukie_pear"
#define REAGENT_NUKIECHERRY "Nukie Cherry"
#define REAGENT_ID_NUKIECHERRY "nukie_cherry"
#define REAGENT_NUKIEMELON "Nukie Melon"
#define REAGENT_ID_NUKIEMELON "nukie_melon"
#define REAGENT_NUKIEBANANA "Nukie Banana"
#define REAGENT_ID_NUKIEBANANA "nukie_banana"
#define REAGENT_NUKIEROSE "Nukie Rose"
#define REAGENT_ID_NUKIEROSE "nukie_rose"
#define REAGENT_NUKIELEMON "Nukie Lemon"
#define REAGENT_ID_NUKIELEMON "nukie_lemon"
#define REAGENT_NUKIEFRUIT "Nukie Fruit"
#define REAGENT_ID_NUKIEFRUIT "nukie_fruit"
#define REAGENT_NUKIESPECIAL "Nukie Limited Edition"
#define REAGENT_ID_NUKIESPECIAL "nukie_special"
#define REAGENT_NUKIEMEGA "Mega Nukie"
#define REAGENT_ID_NUKIEMEGA "nukie_mega"
#define REAGENT_NUKIEMEGASIGHT "Nukie Mega Plum"
#define REAGENT_ID_NUKIEMEGASIGHT "nukie_mega_sight"
#define REAGENT_NUKIEMEGAHEART "Nukie Mega Juice"
#define REAGENT_ID_NUKIEMEGAHEART "nukie_mega_heart"
#define REAGENT_NUKIEMEGASLEEP "Nukie Nega"
#define REAGENT_ID_NUKIEMEGASLEEP "nukie_mega_sleep"
#define REAGENT_NUKIEMEGASHOCK "Nukie Mega Shock"
#define REAGENT_ID_NUKIEMEGASHOCK "nukie_mega_shock"
#define REAGENT_NUKIEMEGAFAST "Nukie Mega Rapid"
#define REAGENT_ID_NUKIEMEGAFAST "nukie_mega_fast"
#define REAGENT_NUKIEMEGAHIGH "Nukie Mega Sky"
#define REAGENT_ID_NUKIEMEGAHIGH "nukie_mega_high"
#define REAGENT_NUKIEMEGASHRINK "Nukie Mega Shrink"
#define REAGENT_ID_NUKIEMEGASHRINK "nukie_mega_shrink"
#define REAGENT_NUKIEMEGAGROWTH "Nukie Mega Growth"
#define REAGENT_ID_NUKIEMEGAGROWTH "nukie_mega_growth"
#define REAGENT_
#define REAGENT_ID_
#define REAGENT_
#define REAGENT_ID_
#define REAGENT_
#define REAGENT_ID_
#define REAGENT_
#define REAGENT_ID_
#define REAGENT_
#define REAGENT_ID_
#define REAGENT_
#define REAGENT_ID_
#define REAGENT_
#define REAGENT_ID_
#define REAGENT_
#define REAGENT_ID_
#define REAGENT_
#define REAGENT_ID_
#define REAGENT_
#define REAGENT_ID_
#define REAGENT_
#define REAGENT_ID_
includes: .dm
excludes: reagents.dm,ores.dm,materials.dm,mre.dm
#define REAGENT_SILVER "Silver"
#define REAGENT_ID_SILVER "silver"
#define REAGENT_GOLD "Gold"
@@ -45,68 +363,282 @@
#define REAGENT_SLIMEJELLY "Slimejelly"
#define REAGENT_ID_SLIMEJELLY "slimejelly"
// Toxins
#define REAGEMT_PHORON "Phoron"
#define REAGENT_ID_PHORON "phoron"
#define REAGENT_LEAD "Lead"
#define REAGENT_ID_LEAD "lead"
#define REAGENT_SPIDERTOXIN "Spidertoxin"
#define REAGENT_ID_SPIDERTOXIN "spidertoxin"
#define REAGENT_ID_SILICATE "silicate"
#define REAGENT_ID_POTASSIUM "potassium"
#define REAGENT_ID_URANIUM "uranium"
#define REAGENT_ID_CARBON "carbon"
#define REAGENT_ID_PLATINUM "platinum"
#define REAGENT_ID_ALUMINIUM "aluminum"
#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate"
todos
defective_nanites
coco
mold
left4zed
var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,"condensedcapsaicin_v","frostoil")
var/randomized_reagent = REAGENT_ID_IRON // The reagent chosen at random to be produced, if there's no one piloting the worm.
var/passive_reagent = "paracetamol" // Reagent passively produced by the leech. Should usually be a painkiller.
xenoChemList += "inaprovaline"
xenoChemList += "bicaridine"
xenoChemList += "dylovene"
xenoChemList += "dexalinp"
xenoChemList += "tricordrazine"
xenoChemList += "cryoxadone"
xenoChemList += "clonexadone"
xenoChemList += "paracetamol"
xenoChemList += "tramadol"
xenoChemList += "oxycodone"
xenoChemList += "ryetalyn"
xenoChemList += "hyperzine"
xenoChemList += "ethylredoxrazine"
xenoChemList += "hyronalin"
xenoChemList += "arithrazine"
xenoChemList += "spaceacillin"
xenoChemList += "sterilizine"
xenoChemList += "leporazine"
xenoChemList += "methylphenidate"
xenoChemList += "citalopram"
xenoChemList += "paroxetine"
xenoChemList += "macrocillin"
xenoChemList += "microcillin"
xenoChemList += "normalcillin"
xenoChemList += "sizeoxadone"
xenoChemList += "ickypak"
xenoChemList += "unsorbitol"
xenoChemList += "toxin"
xenoChemList += "carpotoxin"
xenoChemList += "potassium_chloride"
xenoChemList += "potassium_chlorophoride"
xenoChemList += "zombiepowder"
xenoChemList += "fertilizer"
xenoChemList += "eznutrient"
xenoChemList += "left4zed"
xenoChemList += "robustharvest"
xenoChemList += "plantbgone"
xenoChemList += "serotrotium"
xenoChemList += "nicotine"
xenoChemList += "uranium"
xenoChemList += "silver"
xenoChemList += "gold"
xenoChemList += "adrenaline"
xenoChemList += "holywater"
xenoChemList += "ammonia"
xenoChemList += "diethylamine"
xenoChemList += "fluorosurfactant"
xenoChemList += "foaming_agent"
xenoChemList += "thermite"
xenoChemList += "cleaner"
xenoChemList += "lube"
xenoChemList += "glycerol"
xenoChemList += "coolant"
xenoChemList += "luminol"
xenoChemList += "cornoil"
xenoChemList += "lipozine"
xenoChemList += "sodiumchloride"
xenoChemList += "frostoil"
xenoChemList += "capsaicin"
xenoChemList += "condensedcapsaicin"
xenoChemList += "neurotoxin"
supermatter
mydrogen
silicon
lithium
deuterium
tritium
helium-3
boron
"adminordrazine",
REAGENT_ID_NUTRIMENT,
"macrocillin",
"microcillin",
"normalcillin",
"magicdust"
kitchen_tag = "lime"
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20))
chemreact = list( "nutriment" = list("nutr" = 0.5),
"radium" = list("toxic" = 0.3, "mut" = 1),
"mutagen" = list("nutr" = 0.4, "mut" = 2),
"water" = list("nutr" = -0.1),
"milk" = list("nutr" = 0.3),
"sacid" = list("toxic" = 1),
"pacid" = list("toxic" = 2),
"chlorine" = list("toxic" = 0.5),
"ammonia" = list("toxic" = 0.5),
"sodawater" = list("toxic" = 0.1, "nutr" = -0.1),
"beer" = list("nutr" = 0.6),
"diethylamine" = list("nutr" = 0.9),
"sugar" = list("toxic" = 0.4, "nutr" = 0.2),
"eznutrient" = list("nutr" = 0.8),
"cryoxadone" = list("toxic" = 0.4),
"flourine" = list("toxic" = 0.1),
"robustharvest" = list("nutr" = 1.5),
"glucose" = list("nutr" = 0.5),
"blood" = list("nutr" = 0.75, "toxic" = 0.05, "mut" = 0.45),
"fuel" = list("toxic" = 0.4),
"toxin" = list("toxic" = 0.5),
"carpotoxin" = list("toxic" = 1, "mut" = 1.5),
REAGENT_ID_PHORON = list("toxic" = 1.5, "mut" = 0.03),
"virusfood" = list("nutr" = 1.5, "mut" = 0.32),
"cyanide" = list("toxic" = 3.5),
"slimejelly" = list("nutr" = 0.5),
"amutationtoxin" = list("toxic" = 0.1, "heal" = 1.5, "mut" = 3),
"mutationtoxin" = list("toxic" = 0.1, "heal" = 1, "mut" = 1.5),
"gold" = list("heal" = 0.3, "nutr" = 0.7, "mut" = 0.3),
"uranium" = list("heal" = 0.3, "toxic" = 0.7, "mut" = 1.2),
"glycerol" = list("nutr" = 0.6),
"woodpulp" = list("heal" = 0.1, "nutr" = 0.7),
"docilitytoxin" = list("nutr" = 0.3) )
/datum/seed/citrus/New()
..()
set_trait(TRAIT_HARVEST_REPEAT,1)
set_trait(TRAIT_JUICY,1)
set_trait(TRAIT_MATURATION,6)
set_trait(TRAIT_PRODUCTION,6)
set_trait(TRAIT_YIELD,4)
set_trait(TRAIT_POTENCY,15)
set_trait(TRAIT_PRODUCT_ICON,"treefruit")
set_trait(TRAIT_PRODUCT_COLOUR,"#3AF026")
set_trait(TRAIT_PLANT_ICON,"tree")
set_trait(TRAIT_FLESH_COLOUR,"#3AF026")
/datum/seed/citrus/lemon
name = "lemon"
seed_name = "lemon"
display_name = "lemon trees"
kitchen_tag = "lemon"
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20))
/datum/seed/citrus/lemon/New()
..()
set_trait(TRAIT_PRODUCES_POWER,1)
set_trait(TRAIT_PRODUCT_ICON,"lemon")
set_trait(TRAIT_PRODUCT_COLOUR,"#F0E226")
set_trait(TRAIT_FLESH_COLOUR,"#F0E226")
set_trait(TRAIT_IDEAL_LIGHT, 6)
/datum/seed/citrus/orange
name = "orange"
seed_name = "orange"
display_name = "orange trees"
kitchen_tag = "orange"
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20))
list("zombiepowder" = list(1,10),"condensedcapsaicin""imidazoline" = list(3,5), "carrotjuice" = list(10,20))
chemreact = list( REAGENT_ID_NUTRIMENT = list(XENO_CHEM_NUTRI = 0.5),
"radium" = list(XENO_CHEM_TOXIC = 0.3, XENO_CHEM_MUT = 1),
"mutagen" = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2),
"water" = list(XENO_CHEM_NUTRI = -0.1),
"milk" = list(XENO_CHEM_NUTRI = 0.3),
"sacid" = list(XENO_CHEM_TOXIC = 1),
"pacid" = list(XENO_CHEM_TOXIC = 2),
"chlorine" = list(XENO_CHEM_TOXIC = 0.5),
"ammonia" = list(XENO_CHEM_TOXIC = 0.5),
"sodawater" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1),
"beer" = list(XENO_CHEM_NUTRI = 0.6),
"diethylamine" = list(XENO_CHEM_NUTRI = 0.9),
"sugar" = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2),
"eznutrient" = list(XENO_CHEM_NUTRI = 0.8),
"cryoxadone" = list(XENO_CHEM_TOXIC = 0.4),
"flourine" = list(XENO_CHEM_TOXIC = 0.1),
"robustharvest" = list(XENO_CHEM_NUTRI = 1.5),
"glucose" = list(XENO_CHEM_NUTRI = 0.5),
"blood" = list(XENO_CHEM_NUTRI = 0.75, XENO_CHEM_TOXIC = 0.05, XENO_CHEM_MUT = 0.45),
"fuel" = list(XENO_CHEM_TOXIC = 0.4),
"toxin" = list(XENO_CHEM_TOXIC = 0.5),
"carpotoxin" = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5),
REAGENT_ID_PHORON = list(XENO_CHEM_TOXIC = 1.5, XENO_CHEM_MUT = 0.03),
"virusfood" = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32),
"cyanide" = list(XENO_CHEM_TOXIC = 3.5),
"slimejelly" = list(XENO_CHEM_NUTRI = 0.5),
"amutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1.5, XENO_CHEM_MUT = 3),
"mutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1, XENO_CHEM_MUT = 1.5),
"gold" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_NUTRI = 0.7, XENO_CHEM_MUT = 0.3),
"uranium" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_TOXIC = 0.7, XENO_CHEM_MUT = 1.2),
"glycerol" = list(XENO_CHEM_NUTRI = 0.6),
"woodpulp" = list(XENO_CHEM_HEAL = 0.1, XENO_CHEM_NUTRI = 0.7),
"docilitytoxin" = list(XENO_CHEM_NUTRI = 0.3) )
re.id == "protein" || re.id == "glucose" || re.id == "fishbait")
liquid_protean
peanutoil
cornoil
durianpaste
if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
descriptors |= "sweet"
if(reagents.has_reagent("anti_toxin"))
descriptors |= "astringent"
if(reagents.has_reagent("frostoil"))
descriptors |= "numbing"
if(reagents.has_reagent(REAGENT_ID_NUTRIMENT))
descriptors |= "nutritious"
if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin"))
descriptors |= "spicy"
if(reagents.has_reagent("coco"))
descriptors |= "bitter"
if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice"))
descriptors |= "sweet-sour"
if(reagents.has_reagent("radium") || reagents.has_reagent("uranium"))
descriptors |= "radioactive"
if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin"))
descriptors |= "poisonous"
if(reagents.has_reagent("psilocybin") || reagents.has_reagent("bliss") || reagents.has_reagent("earthsblood"))
descriptors |= "hallucinogenic"
if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood"))
descriptors |= "medicinal"
if(reagents.has_reagent("gold") || reagents.has_reagent("earthsblood"))
descriptors |= "shiny"
if(reagents.has_reagent("lube"))
descriptors |= "slippery"
if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid"))
descriptors |= "acidic"
var/static/list/toxic_reagents = list(
"anti_toxin" = -2,
"toxin" = 2,
REAGENT_ID_FLUORINE = 2.5,
"chlorine" = 1.5,
"sacid" = 1.5,
"pacid" = 3,
"plantbgone" = 3,
"cryoxadone" = -3,
"radium" = 2
)
var/static/list/nutrient_reagents = list(
"milk" = 0.1,
"beer" = 0.25,
"phosphorus" = 0.1,
"sugar" = 0.1,
"sodawater" = 0.1,
"ammonia" = 1,
"diethylamine" = 2,
REAGENT_ID_NUTRIMENT = 1,
"adminordrazine" = 1,
"eznutrient" = 1,
"robustharvest" = 1,
"left4zed" = 1
)
var/static/list/weedkiller_reagents = list(
REAGENT_ID_FLUORINE = -4,
"chlorine" = -3,
"phosphorus" = -2,
"sugar" = 2,
"sacid" = -2,
"pacid" = -4,
"plantbgone" = -8,
"adminordrazine" = -5
)
var/static/list/pestkiller_reagents = list(
"sugar" = 2,
"diethylamine" = -2,
"adminordrazine" = -5
)
var/static/list/water_reagents = list(
"water" = 1,
"adminordrazine" = 1,
"milk" = 0.9,
"beer" = 0.7,
REAGENT_ID_FLUORINE = -0.5,
"chlorine" = -0.5,
"phosphorus" = -0.5,
"water" = 1,
"sodawater" = 1,
)
// Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order).
var/static/list/beneficial_reagents = list(
"beer" = list( -0.05, 0, 0 ),
REAGENT_ID_FLUORINE = list( -2, 0, 0 ),
"chlorine" = list( -1, 0, 0 ),
"phosphorus" = list( -0.75, 0, 0 ),
"sodawater" = list( 0.1, 0, 0 ),
"sacid" = list( -1, 0, 0 ),
"pacid" = list( -2, 0, 0 ),
"plantbgone" = list( -2, 0, 0.2),
"cryoxadone" = list( 3, 0, 0 ),
"ammonia" = list( 0.5, 0, 0 ),
"diethylamine" = list( 1, 0, 0 ),
REAGENT_ID_NUTRIMENT = list( 0.5, 0.1, 0 ),
"radium" = list( -1.5, 0, 0.2),
"adminordrazine" = list( 1, 1, 1 ),
"robustharvest" = list( 0, 0.2, 0 ),
"left4zed" = list( 0, 0, 0.2)
)
// Mutagen list specifies minimum value for the mutation to take place, rather
// than a bound as the lists above specify.
var/static/list/mutagenic_reagents = list(
"radium" = 8,
"mutagen" = 15
)
+2 -2
View File
@@ -110,8 +110,8 @@ SUBSYSTEM_DEF(plants)
if(seed.consume_gasses)
seed.consume_gasses[GAS_PHORON] = null
seed.consume_gasses[GAS_CO2] = null
if(seed.chems && !isnull(seed.chems[REAGENT_PACID]))
seed.chems[REAGENT_PACID] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous.
if(seed.chems && !isnull(seed.chems[REAGENT_ID_PACID]))
seed.chems[REAGENT_ID_PACID] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous.
seed.chems -= null // Setting to null does not actually remove the entry, which is weird.
seed.set_trait(TRAIT_IDEAL_HEAT,293)
seed.set_trait(TRAIT_HEAT_TOLERANCE,20)
+2 -2
View File
@@ -1,8 +1,8 @@
GLOBAL_LIST_EMPTY(archive_diseases)
GLOBAL_LIST_INIT(advance_cures, list(
"sodiumchloride", "sugar", "orangejuice",
"spaceacillin", "glucose", "ethanol",
REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, "orangejuice",
"spaceacillin", "glucose", REAGENT_ID_ETHANOL,
"dyloteane", "impedrezene", "hepanephrodaxon",
"gold", "silver"
))
@@ -32,11 +32,11 @@ Bonus
if(A.stage >= 3)
M.slurring = max(0, M.slurring-4)
M.druggy = max(0, M.druggy-4)
M.reagents.remove_reagent("ethanol", 3)
M.reagents.remove_reagent(REAGENT_ID_ETHANOL, 3)
if(A.stage >= 4)
M.drowsyness = max(0, M.drowsyness-4)
if(M.reagents.has_reagent("bliss"))
M.reagents.del_reagent("bliss")
if(M.reagents.has_reagent(REAGENT_ID_BLISS))
M.reagents.del_reagent(REAGENT_ID_BLISS)
M.hallucination = max(0, M.hallucination-4)
if(A.stage >= 5)
if(M.reagents.get_reagent_amount("alkysine") < 10)
+1 -1
View File
@@ -5,7 +5,7 @@
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Ethanol"
cures = list("ethanol")
cures = list(REAGENT_ID_ETHANOL)
agent = "Excess Lepdopticides"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "If left untreated subject will regurgitate butterflies."
+1 -1
View File
@@ -5,7 +5,7 @@
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Sugar"
cures = list("sugar")
cures = list(REAGENT_ID_SUGAR)
agent = "Apidae Infection"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "If left untreated, subject will regurgitate bees."
+1 -1
View File
@@ -4,7 +4,7 @@
spread_text = "Airborne"
spread_flags = AIRBORNE
cure_text = "Rest & Spaceacillin"
cures = list("spaceacillin", "chicken_soup")
cures = list("spaceacillin", REAGENT_ID_CHICKENSOUP)
needs_all_cures = FALSE
agent = "XY-rhinovirus"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
+1 -1
View File
@@ -3,7 +3,7 @@
max_stages = 3
spread_text = "Airborne"
cure_text = "Spaceacillin"
cures = list("spaceacillin", "chicken_soup")
cures = list("spaceacillin", REAGENT_ID_CHICKENSOUP)
needs_all_cures = FALSE
cure_chance = 10
agent = "H13N1 flu virion"
+1 -1
View File
@@ -6,7 +6,7 @@
spread_flags = NON_CONTAGIOUS
cure_text = "Sleep"
agent = "Salmonella"
cures = list("chicken_soup")
cures = list(REAGENT_ID_CHICKENSOUP)
cure_chance = 10
viable_mobtypes = list(/mob/living/carbon/human)
desc = "Nausea, sickness, and vomitting."
+1 -1
View File
@@ -5,7 +5,7 @@
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Ethanol"
cures = list("ethanol")
cures = list(REAGENT_ID_ETHANOL)
agent = "Excess Snuggles"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "If left untreated subject will regurgitate... puppies."
+1 -1
View File
@@ -3,7 +3,7 @@
max_stages = 4
spread_text = "Airbone"
cure_text = "Iron"
cures = list("iron")
cures = list(REAGENT_ID_IRON)
agent = "Fukkos Miracos"
viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 0.75
+2 -2
View File
@@ -1143,14 +1143,14 @@ datum
var/target_name
New(var/text,var/joba)
..()
var/list/items = list("Sulphuric acid", "Polytrinic acid", "Space Lube", "Unstable mutagen",\
var/list/items = list("Sulphuric acid", REAGENT_PACID, "Space Lube", "Unstable mutagen",\
"Leporazine", "Cryptobiolin", "Lexorin ",\
"Kelotane", "Dexalin", "Tricordrazine")
target_name = pick(items)
switch(target_name)
if("Sulphuric acid")
steal_target = /datum/reagent/acid
if("Polytrinic acid")
if(REAGENT_PACID)
steal_target = /datum/reagent/pacid
if("Space Lube")
steal_target = /datum/reagent/lube
@@ -27,7 +27,7 @@
if(desired_turf) // This shouldn't fail but...
var/obj/effect/effect/water/W = new /obj/effect/effect/water(get_turf(T))
W.create_reagents(60)
W.reagents.add_reagent(id = "water", amount = 60, data = null, safety = 0)
W.reagents.add_reagent(id = REAGENT_ID_WATER, amount = 60, data = null, safety = 0)
W.set_color()
W.set_up(desired_turf)
flick(initial(icon_state),W) // Otherwise pooling causes the animation to stay stuck at the end.
@@ -40,5 +40,5 @@
else
add_attack_logs(user,hit_atom,"Wetted the floor with [src] at [T.x],[T.y],[T.z]")
else if(hit_atom.reagents && !ismob(hit_atom)) //TODO: Something for the scepter
hit_atom.reagents.add_reagent(id = "water", amount = 60, data = null, safety = 0)
adjust_instability(5)
hit_atom.reagents.add_reagent(id = REAGENT_ID_WATER, amount = 60, data = null, safety = 0)
adjust_instability(5)
+1 -1
View File
@@ -234,7 +234,7 @@
if(ishuman(occupant) && !(NO_BLOOD in occupant.species.flags) && occupant.vessel)
occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
occupantData["hasBlood"] = 1
var/blood_volume = round(occupant.vessel.get_reagent_amount("blood"))
var/blood_volume = round(occupant.vessel.get_reagent_amount(REAGENT_ID_BLOOD))
occupantData["bloodLevel"] = blood_volume
occupantData["bloodMax"] = occupant.species.blood_volume
occupantData["bloodPercent"] = round(100*(blood_volume/occupant.species.blood_volume), 0.01) //copy pasta ends here
+2 -2
View File
@@ -274,9 +274,9 @@
var/S = 0
for(var/obj/item/reagent_containers/food/snacks/grown/I in contents)
S += 5
if(I.reagents.get_reagent_amount("nutriment") < 0.1)
if(I.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) < 0.1)
points += 1
else points += I.reagents.get_reagent_amount("nutriment") * 10 * eat_eff
else points += I.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) * 10 * eat_eff
qdel(I)
if(S)
processing = 1
+1 -1
View File
@@ -297,7 +297,7 @@
var/datum/reagent/blood/injected = locate() in S.reagents.reagent_list //Grab some blood
if(injected && injected.data)
loaded_dna = injected.data
S.reagents.remove_reagent("blood", injected.volume)
S.reagents.remove_reagent(REAGENT_ID_BLOOD, injected.volume)
to_chat(user, span_info("You scan the blood sample into the bioprinter."))
return
else if(istype(W,/obj/item/reagent_containers/glass))
+1 -1
View File
@@ -108,7 +108,7 @@
if(ishuman(occupant) && !(NO_BLOOD in occupant.species.flags) && occupant.vessel)
occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
occupantData["hasBlood"] = 1
var/blood_volume = round(occupant.vessel.get_reagent_amount("blood"))
var/blood_volume = round(occupant.vessel.get_reagent_amount(REAGENT_ID_BLOOD))
occupantData["bloodLevel"] = blood_volume
occupantData["bloodMax"] = occupant.species.blood_volume
occupantData["bloodPercent"] = round(100*(blood_volume/occupant.species.blood_volume), 0.01) //copy pasta ends here
+1 -1
View File
@@ -161,7 +161,7 @@
enemy_hp -= attackamt
arcade_action(ui.user)
if("heal")
if(XENO_CHEM_HEAL)
blocked = 1
var/pointamt = rand(1,3)
var/healamt = rand(6,8)
+1 -1
View File
@@ -127,7 +127,7 @@
return
// If the human is losing too much blood, beep.
if(T.vessel.get_reagent_amount("blood") < T.species.blood_volume*T.species.blood_level_safe)
if(T.vessel.get_reagent_amount(REAGENT_ID_BLOOD) < T.species.blood_volume*T.species.blood_level_safe)
visible_message("\The [src] beeps loudly.")
var/datum/reagent/B = T.take_blood(beaker,amount)
+1 -1
View File
@@ -119,7 +119,7 @@
return
var/obj/item/reagent_containers/glass/bottle/B = create_culture(name)
B.desc = "A small bottle. Contains [D.agent] culture in synthblood medium."
B.reagents.add_reagent("blood", 20, list("viruses" = list(D)))
B.reagents.add_reagent(REAGENT_ID_BLOOD, 20, list("viruses" = list(D)))
if("clone_vaccine")
if(wait)
atom_say("The replicator is not ready yet.")
+1 -1
View File
@@ -127,7 +127,7 @@
for(var/id in carried_reagents)
F.reagents.add_reagent(id, 1, safety = 1) //makes a safety call because all reagents should have already reacted anyway
else
F.reagents.add_reagent("water", 1, safety = 1)
F.reagents.add_reagent(REAGENT_ID_WATER, 1, safety = 1)
// wall formed by metal foams, dense and opaque, but easy to break
@@ -105,7 +105,7 @@
/obj/effect/temp_visual/heal
name = "healing glow"
icon_state = "heal"
icon_state = XENO_CHEM_HEAL
duration = 15
/obj/effect/temp_visual/heal/Initialize(mapload)
+2 -2
View File
@@ -17,11 +17,11 @@
/obj/item/reagent_containers/glass/beaker/vial/random
flags = 0
var/list/random_reagent_list = list(list("water" = 15) = 1, list("cleaner" = 15) = 1)
var/list/random_reagent_list = list(list(REAGENT_ID_WATER = 15) = 1, list("cleaner" = 15) = 1)
/obj/item/reagent_containers/glass/beaker/vial/random/toxin
random_reagent_list = list(
list("mindbreaker" = 10, "bliss" = 20) = 3,
list("mindbreaker" = 10, REAGENT_ID_BLISS = 20) = 3,
list("carpotoxin" = 15) = 2,
list("impedrezene" = 15) = 2,
list("zombiepowder" = 10) = 1)
+1 -1
View File
@@ -339,7 +339,7 @@
if(!heart)
return TRUE
var/blood_volume = H.vessel.get_reagent_amount("blood")
var/blood_volume = H.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
if(!heart || heart.is_broken())
blood_volume *= 0.3
else if(heart.is_bruised())
@@ -150,7 +150,7 @@
to_chat(user, span_notice("There's visible lag between left and right pupils' reactions."))
var/list/pinpoint = list("oxycodone"=1,"tramadol"=5)
var/list/dilating = list("bliss"=5,"ambrosia_extract"=5,"mindbreaker"=1)
var/list/dilating = list(REAGENT_ID_BLISS=5,REAGENT_ID_AMBROSIAEXTRACT=5,"mindbreaker"=1)
if(M.reagents.has_any_reagent(pinpoint) || H.ingested.has_any_reagent(pinpoint))
to_chat(user, span_notice("\The [M]'s pupils are already pinpoint and cannot narrow any more."))
else if(M.reagents.has_any_reagent(dilating) || H.ingested.has_any_reagent(dilating))
@@ -67,7 +67,7 @@
if(org.damage >= 1 && !istype(org, /obj/item/organ/internal/brain))
organ = TRUE
var/blood_volume = M.vessel.get_reagent_amount("blood")
var/blood_volume = M.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
if(blood_volume <= M.species.blood_volume*M.species.blood_level_safe)
bloodloss = TRUE
@@ -359,7 +359,7 @@
// Blood level
if(M:vessel)
var/blood_volume = H.vessel.get_reagent_amount("blood")
var/blood_volume = H.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
var/blood_percent = round((blood_volume / H.species.blood_volume)*100)
var/blood_type = H.dna.b_type
var/blood_reagent = H.species.blood_reagents
@@ -40,7 +40,7 @@
if(reagents.total_volume)
var/list/blood_traces = list()
for(var/datum/reagent/R in reagents.reagent_list)
if(R.id != "blood")
if(R.id != REAGENT_ID_BLOOD)
reagents.clear_reagents()
to_chat(user, span_warning("The sample was contaminated! Please insert another sample"))
return
@@ -43,6 +43,6 @@
desc = "A pre-arranged home chemistry kit. This one is for rather specific set of gender-altering chemicals."
preface_string = "This kit can be used to create a vial of a gender-altering chemical, but there's only enough material for one."
preface_title = "Gender Chemistry Kit"
item_options = list("Androrovir" = /obj/item/reagent_containers/glass/beaker/vial/androrovir,
"Gynorovir" = /obj/item/reagent_containers/glass/beaker/vial/gynorovir,
"Androgynorovir" = /obj/item/reagent_containers/glass/beaker/vial/androgynorovir)
item_options = list(REAGENT_ANDROROVIR = /obj/item/reagent_containers/glass/beaker/vial/androrovir,
REAGENT_GYNOROVIR = /obj/item/reagent_containers/glass/beaker/vial/gynorovir,
REAGENT_ANDROGYNOROVIR = /obj/item/reagent_containers/glass/beaker/vial/androgynorovir)
+1 -1
View File
@@ -59,7 +59,7 @@
if(O.reagents.total_volume < 1)
to_chat(user, "The [O] is empty.")
else if(O.reagents.total_volume >= 1)
if(O.reagents.has_reagent("pacid", 1))
if(O.reagents.has_reagent(REAGENT_ID_PACID, 1))
to_chat(user, "The acid chews through the balloon!")
O.reagents.splash(user, reagents.total_volume)
qdel(src)
+5 -5
View File
@@ -104,12 +104,12 @@
/obj/item/clothing/mask/chewable/tobacco/cheap
name = "chewing tobacco"
desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it tastes less like an ash-tray when you stuff it into your face."
filling = list("nicotine" = 2)
filling = list(REAGENT_ID_NICOTINE = 2)
/obj/item/clothing/mask/chewable/tobacco/fine
name = "deluxe chewing tobacco"
desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face."
filling = list("nicotine" = 3)
filling = list(REAGENT_ID_NICOTINE = 3)
/obj/item/clothing/mask/chewable/tobacco/nico
name = "nicotine gum"
@@ -120,7 +120,7 @@
/obj/item/clothing/mask/chewable/tobacco/nico/Initialize()
. = ..()
reagents.add_reagent("nicotine", 2)
reagents.add_reagent(REAGENT_ID_NICOTINE, 2)
color = reagents.get_color()
/obj/item/storage/chewables
@@ -215,7 +215,7 @@
slot_flags = SLOT_EARS | SLOT_MASK
chem_volume = 50
chewtime = 300
filling = list("sugar" = 2)
filling = list(REAGENT_ID_SUGAR = 2)
/obj/item/clothing/mask/chewable/candy/gum
name = "chewing gum"
@@ -287,7 +287,7 @@
desc = "A chocolate-coated biscuit stick."
icon_state = "pockystick"
item_state = "pocky"
filling = list("sugar" = 2, "chocolate" = 5)
filling = list(REAGENT_ID_SUGAR = 2, "chocolate" = 5)
type_butt = null
/obj/item/clothing/mask/chewable/candy/pocky/process()
@@ -175,9 +175,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
e.start()
qdel(src)
return
if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
if(reagents.get_reagent_amount(REAGENT_ID_FUEL)) // the fuel explodes, too, but much less violently
var/datum/effect/effect/system/reagents_explosion/e = new()
e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0)
e.set_up(round(reagents.get_reagent_amount(REAGENT_ID_FUEL) / 5, 1), get_turf(src), 0, 0)
e.start()
qdel(src)
return
@@ -292,7 +292,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/cigarette/Initialize()
. = ..()
if(nicotine_amt)
reagents.add_reagent("nicotine", nicotine_amt)
reagents.add_reagent(REAGENT_ID_NICOTINE, nicotine_amt)
/obj/item/clothing/mask/smokable/cigarette/attackby(obj/item/W as obj, mob/user as mob)
..()
+20 -20
View File
@@ -170,32 +170,32 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says you can add whatever flavoring agents you want."
/obj/item/reagent_containers/ecig_cartridge/blanknico/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/ecig_cartridge/med_nicotine
name = "tobacco flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored."
/obj/item/reagent_containers/ecig_cartridge/med_nicotine/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 15)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 15)
/obj/item/reagent_containers/ecig_cartridge/high_nicotine
name = "high nicotine tobacco flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored, with extra nicotine."
/obj/item/reagent_containers/ecig_cartridge/high_nicotine/New()
..()
reagents.add_reagent("nicotine", 10)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/ecig_cartridge/orange
name = "orange flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its orange flavored."
/obj/item/reagent_containers/ecig_cartridge/orange/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("orangejuice", 5)
/obj/item/reagent_containers/ecig_cartridge/mint
@@ -203,8 +203,8 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its mint flavored."
/obj/item/reagent_containers/ecig_cartridge/mint/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("menthol", 5)
/obj/item/reagent_containers/ecig_cartridge/watermelon
@@ -212,8 +212,8 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its watermelon flavored."
/obj/item/reagent_containers/ecig_cartridge/watermelon/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("watermelonjuice", 5)
/obj/item/reagent_containers/ecig_cartridge/grape
@@ -221,8 +221,8 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its grape flavored."
/obj/item/reagent_containers/ecig_cartridge/grape/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("grapejuice", 5)
/obj/item/reagent_containers/ecig_cartridge/lemonlime
@@ -230,8 +230,8 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its lemon-lime flavored."
/obj/item/reagent_containers/ecig_cartridge/lemonlime/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("lemon_lime", 5)
/obj/item/reagent_containers/ecig_cartridge/coffee
@@ -239,8 +239,8 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its coffee flavored."
/obj/item/reagent_containers/ecig_cartridge/coffee/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("coffee", 5)
/*
/obj/item/reagent_containers/ecig_cartridge/cannabis
@@ -248,7 +248,7 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label seems to be suspiciously scuffed off..."
/obj/item/reagent_containers/ecig_cartridge/cannabis/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("cannabis", 5)
*/
@@ -213,9 +213,9 @@
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("aluminum", 30)
B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 30)
B2.reagents.add_reagent("foaming_agent", 10)
B2.reagents.add_reagent("pacid", 10)
B2.reagents.add_reagent(REAGENT_ID_PACID, 10)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -235,11 +235,11 @@
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("aluminum", 15)
B1.reagents.add_reagent("fuel",20)
B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 15)
B1.reagents.add_reagent(REAGENT_ID_FUEL,20)
B2.reagents.add_reagent(REAGENT_ID_PHORON, 15)
B2.reagents.add_reagent("sacid", 15)
B1.reagents.add_reagent("fuel",20)
B2.reagents.add_reagent(REAGENT_ID_SACID, 15)
B1.reagents.add_reagent(REAGENT_ID_FUEL,20)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -259,9 +259,9 @@
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("plantbgone", 25)
B1.reagents.add_reagent("potassium", 25)
B2.reagents.add_reagent("phosphorus", 25)
B2.reagents.add_reagent("sugar", 25)
B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 25)
B2.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 25)
B2.reagents.add_reagent(REAGENT_ID_SUGAR, 25)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -283,7 +283,7 @@
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("fluorosurfactant", 40)
B2.reagents.add_reagent("water", 40)
B2.reagents.add_reagent(REAGENT_ID_WATER, 40)
B2.reagents.add_reagent("cleaner", 10)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -304,10 +304,10 @@
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
B1.reagents.add_reagent("phosphorus", 40)
B1.reagents.add_reagent("potassium", 40)
B1.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 40)
B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 40)
B1.reagents.add_reagent("condensedcapsaicin", 40)
B2.reagents.add_reagent("sugar", 40)
B2.reagents.add_reagent(REAGENT_ID_SUGAR, 40)
B2.reagents.add_reagent("condensedcapsaicin", 80)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -2,8 +2,8 @@
name = "reagent generator implant"
desc = "This is an implant that has attached storage and generates a reagent."
implant_color = "r"
var/list/generated_reagents = list("water" = 2) //Any number of reagents, the associated value is how many units are generated per process()
var/reagent_name = "water" //What is shown when reagents are removed, doesn't need to be an actual reagent
var/list/generated_reagents = list(REAGENT_ID_WATER = 2) //Any number of reagents, the associated value is how many units are generated per process()
var/reagent_name = REAGENT_ID_WATER //What is shown when reagents are removed, doesn't need to be an actual reagent
var/gen_cost = 0.5 //amount of nutrient taken from the host per process tick
var/transfer_amount = 30 //amount transferred when using verb
var/usable_volume = 120
@@ -16,7 +16,7 @@
var/datum/reagents/R = new/datum/reagents(max_fuel)
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)
R.add_reagent(REAGENT_ID_FUEL, max_fuel)
START_PROCESSING(SSobj, src)
. = ..()
@@ -73,7 +73,7 @@
playsound(src, 'sound/weapons/chainsaw_attack.ogg',40,1)
if(A && on)
if(get_fuel() > 0)
reagents.remove_reagent("fuel", 1)
reagents.remove_reagent(REAGENT_ID_FUEL, 1)
if(istype(A,/obj/structure/window))
var/obj/structure/window/W = A
W.shatter()
@@ -103,14 +103,14 @@
if(on)
if(get_fuel() > 0)
reagents.remove_reagent("fuel", 1)
reagents.remove_reagent(REAGENT_ID_FUEL, 1)
playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',15,1)
if(get_fuel() <= 0)
to_chat(usr, "\The [src] sputters to a stop!")
turnOff()
/obj/item/chainsaw/proc/get_fuel()
return reagents.get_reagent_amount("fuel")
return reagents.get_reagent_amount(REAGENT_ID_FUEL)
/obj/item/chainsaw/examine(mob/user)
. = ..()
@@ -20,7 +20,7 @@
START_PROCESSING(SSobj, src)
/turf/proc/clean_deploy(atom/source)
if(source.reagents.has_reagent("water", 1))
if(source.reagents.has_reagent(REAGENT_ID_WATER, 1))
clean_blood()
if(istype(src, /turf/simulated))
var/turf/simulated/T = src
+20 -20
View File
@@ -108,26 +108,26 @@
var/current_capacity = 0
var/max_pickup = 100 //How much ore can be picked up in one go. There to prevent someone from walking on a turf with 10000 ore and making the server cry.
var/list/stored_ore = list(
"sand" = 0,
"hematite" = 0,
"carbon" = 0,
"raw copper" = 0,
"raw tin" = 0,
"void opal" = 0,
"painite" = 0,
"quartz" = 0,
"raw bauxite" = 0,
"phoron" = 0,
"silver" = 0,
"gold" = 0,
"marble" = 0,
"uranium" = 0,
"diamond" = 0,
"platinum" = 0,
"lead" = 0,
"mhydrogen" = 0,
"verdantium" = 0,
"rutile" = 0)
ORE_SAND = 0,
ORE_HEMATITE = 0,
ORE_CARBON = 0,
ORE_COPPER = 0,
ORE_TIN = 0,
ORE_VOPAL = 0,
ORE_PAINITE = 0,
ORE_QUARTZ = 0,
ORE_BAUXITE = 0,
ORE_PHORON = 0,
ORE_SILVER = 0,
ORE_GOLD = 0,
ORE_MARBLE = 0,
ORE_URANIUM = 0,
ORE_DIAMOND = 0,
ORE_PLATINUM = 0,
ORE_LEAD = 0,
ORE_MHYDROGEN = 0,
ORE_VERDANTIUM = 0,
ORE_RUTILE = 0)
var/last_update = 0
/obj/item/storage/bag/ore/holding
@@ -103,10 +103,10 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
/obj/item/storage/bible/afterattack(atom/A, mob/user as mob, proximity)
if(!proximity) return
if(user.mind && (user.mind.assigned_role == JOB_CHAPLAIN))
if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder
if(A.reagents && A.reagents.has_reagent(REAGENT_ID_WATER)) //blesses all the water in the holder
to_chat(user, span_notice("You bless [A]."))
var/water2holy = A.reagents.get_reagent_amount("water")
A.reagents.del_reagent("water")
var/water2holy = A.reagents.get_reagent_amount(REAGENT_ID_WATER)
A.reagents.del_reagent(REAGENT_ID_WATER)
A.reagents.add_reagent("holywater",water2holy)
/obj/item/storage/bible/attackby(obj/item/W as obj, mob/user as mob)
@@ -364,19 +364,19 @@ MRE Stuff
if("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti", "chicken tenders")
icon_state = "tgmcmre_entree"
nutriment_amt = 5
starts_with = list("sodiumchloride" = 1)
starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1)
if("meatballs", "cheese spread", "beef turnover", "mashed potatoes")
icon_state = "tgmcmre_side"
nutriment_amt = 3
starts_with = list("sodiumchloride" = 1)
starts_with = list(REAGENT_ID_SODIUMCHLORIDE= 1)
if("biscuit", "pretzels", "peanuts", "cracker")
icon_state = "tgmcmre_snack"
nutriment_amt = 2
starts_with = list("sodiumchloride" = 1)
starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1)
if("spiced apples", "chocolate brownie", "sugar cookie", "choco bar")
icon_state = "tgmcmre_dessert"
nutriment_amt = 2
starts_with = list("sugar" = 1)
starts_with = list(REAGENT_ID_SUGAR = 1)
package_open_state = "tgmcmre_[flavor]"
nutriment_desc = list("[new_taste]" = nutriment_amt)
@@ -196,26 +196,26 @@
var/obj/item/storage/fancy/cigarettes/pack
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5))
pack.desc += " 'F' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5))
pack.desc += " 'F' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5))
pack.desc += " 'S' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5))
pack.desc += " 'S' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
// Dylovene. Going with 1.5 rather than 1.6666666...
fill_cigarre_package(pack, list("potassium" = 1.5, REAGENT_ID_NITROGEN = 1.5, "silicon" = 1.5))
fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 1.5, REAGENT_ID_NITROGEN = 1.5, REAGENT_ID_SILICON = 1.5))
// Mindbreaker
fill_cigarre_package(pack, list("silicon" = 4.5, "hydrogen" = 4.5))
fill_cigarre_package(pack, list(REAGENT_ID_SILICON = 4.5, REAGENT_ID_HYDROGEN = 4.5))
pack.desc += " 'MB' has been scribbled on it."
@@ -49,7 +49,7 @@
var/datum/reagents/R = new/datum/reagents(max_fuel)
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)
R.add_reagent(REAGENT_ID_FUEL, max_fuel)
update_icon()
if(always_process)
START_PROCESSING(SSobj, src)
@@ -185,7 +185,7 @@
//Returns the amount of fuel in the welder
/obj/item/weldingtool/proc/get_fuel()
return reagents.get_reagent_amount("fuel")
return reagents.get_reagent_amount(REAGENT_ID_FUEL)
/obj/item/weldingtool/proc/get_max_fuel()
return max_fuel
@@ -197,7 +197,7 @@
if(amount)
burned_fuel_for = 0 // Reset the counter since we're removing fuel.
if(get_fuel() >= amount)
reagents.remove_reagent("fuel", amount)
reagents.remove_reagent(REAGENT_ID_FUEL, amount)
if(M)
eyecheck(M)
update_icon()
@@ -440,7 +440,7 @@
/obj/item/weldingtool/alien/process()
if(get_fuel() <= get_max_fuel())
reagents.add_reagent("fuel", 1)
reagents.add_reagent(REAGENT_ID_FUEL, 1)
..()
/obj/item/weldingtool/experimental
@@ -461,7 +461,7 @@
..()
if(get_fuel() < get_max_fuel() && nextrefueltick < world.time)
nextrefueltick = world.time + 10
reagents.add_reagent("fuel", 1)
reagents.add_reagent(REAGENT_ID_FUEL, 1)
/obj/item/weldingtool/experimental/hybrid
name = "strange welding tool"
@@ -17,7 +17,7 @@
var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)
R.add_reagent(REAGENT_ID_FUEL, max_fuel)
nozzle = new nozzle_type(src)
nozzle_attached = 1
@@ -423,7 +423,7 @@
return
// If the human is losing too much blood, beep.
if(H.vessel.get_reagent_amount("blood") < H.species.blood_volume*H.species.blood_level_safe)
if(H.vessel.get_reagent_amount(REAGENT_ID_BLOOD) < H.species.blood_volume*H.species.blood_level_safe)
visible_message("\The [src] beeps loudly.")
var/datum/reagent/B = H.take_blood(beaker,amount)
+4 -4
View File
@@ -216,7 +216,7 @@
mymist = null
if(on)
add_overlay(image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir))
add_overlay(image('icons/obj/watercloset.dmi', src, REAGENT_ID_WATER, MOB_LAYER + 1, dir))
if(temperature_settings[watertemp] < T20C)
return //no mist for cold water
if(!ismist)
@@ -265,7 +265,7 @@
var/mob/living/L = AM
process_heat(L)
wash_floor()
reagents.add_reagent("water", reagents.get_free_space())
reagents.add_reagent(REAGENT_ID_WATER, reagents.get_free_space())
/obj/machinery/shower/proc/wash_floor()
if(is_washing)
@@ -588,7 +588,7 @@
var/obj/item/reagent_containers/RG = O
if (istype(RG) && RG.is_open_container())
RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
RG.reagents.add_reagent(REAGENT_ID_WATER, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
user.visible_message(span_notice("[user] fills \the [RG] using \the [src]."),span_notice("You fill \the [RG] using \the [src]."))
playsound(src, 'sound/effects/sink.ogg', 75, 1)
return 1
@@ -612,7 +612,7 @@
span_userdanger("[user] was stunned by [TU.his] wet [O]!"))
return 1
else if(istype(O, /obj/item/mop))
O.reagents.add_reagent("water", 5)
O.reagents.add_reagent(REAGENT_ID_WATER, 5)
to_chat(user, span_notice("You wet \the [O] in \the [src]."))
playsound(src, 'sound/effects/slosh.ogg', 25, 1)
return
+1 -1
View File
@@ -14,7 +14,7 @@
depth = 10 // Higher numbers indicates deeper water, 10 is unused right now, but may be useful for adding effects in the future.
reagent_type = "water"
reagent_type = REAGENT_ID_WATER
/turf/simulated/floor/water/underwater/return_air_for_internal_lifeform(var/mob/living/L)
if(L.can_breathe_water()) // For squid.
+1 -1
View File
@@ -236,4 +236,4 @@ var/list/flesh_overlay_cache = list()
icon = 'icons/turf/wall_masks_vr.dmi'
/turf/simulated/wall/stonelogs/Initialize(mapload)
. = ..(mapload, "concrete",MAT_LOG)
. = ..(mapload, "concrete",MAT_LOG)
+4 -4
View File
@@ -19,7 +19,7 @@
var/depth = 1 // Higher numbers indicates deeper water.
var/reagent_type = "water"
var/reagent_type = REAGENT_ID_WATER
/turf/simulated/floor/water/Initialize()
. = ..()
@@ -241,14 +241,14 @@ var/list/shoreline_icon_cache = list()
L.adjustToxLoss(poisonlevel)
/turf/simulated/floor/water/blood
name = "blood"
name = REAGENT_ID_BLOOD
desc = "A body of blood. It seems shallow enough to walk through, if needed."
icon = 'icons/turf/outdoors.dmi'
icon_state = "bloodshallow"
water_icon = 'icons/turf/outdoors.dmi'
water_state = "bloodshallow"
under_state = "rock"
reagent_type = "blood"
reagent_type = REAGENT_ID_BLOOD
/turf/simulated/floor/water/blood/get_edge_icon_state()
return "bloodshallow"
@@ -272,4 +272,4 @@ var/list/shoreline_icon_cache = list()
water_icon = 'icons/turf/flooring/glamour.dmi'
water_state = "water"
under_state = "glamour"
reagent_type = "water"
reagent_type = REAGENT_ID_WATER
+1 -1
View File
@@ -281,7 +281,7 @@
//expects an atom containing the reagents used to clean the turf
/turf/proc/clean(atom/source, mob/user)
if(source.reagents.has_reagent("water", 1) || source.reagents.has_reagent("cleaner", 1))
if(source.reagents.has_reagent(REAGENT_ID_WATER, 1) || source.reagents.has_reagent("cleaner", 1))
clean_blood()
if(istype(src, /turf/simulated))
var/turf/simulated/T = src
+2 -2
View File
@@ -22,7 +22,7 @@
spawn()
var/obj/effect/effect/water/splash = new(T)
splash.create_reagents(15)
splash.reagents.add_reagent("blood", 10,list("blood_colour" = color))
splash.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color))
splash.set_color()
splash.set_up(F, 2, 3)
@@ -30,7 +30,7 @@
var/obj/effect/decal/cleanable/chemcoating/blood = locate() in T
if(!istype(blood))
blood = new(T)
blood.reagents.add_reagent("blood", 10,list("blood_colour" = color))
blood.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color))
blood.reagents.add_reagent("tricorlidaze", 5)
blood.update_icon()
@@ -20,7 +20,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
list("radium", "radium", 0, 80)
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
var/max_reagent_volume = 80 //Used when refilling.
@@ -40,7 +40,7 @@
list("clotting agent", "myelamine", 0, 30),
list("peridaxon", "peridaxon", 0, 30),
list("hyronalin", "hyronalin", 0, 30),
list("radium", "radium", 0, 30)
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
/obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user)
@@ -156,7 +156,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
list("radium", "radium", 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
list("clotting agent", "myelamine", 0, 80)
)
@@ -169,6 +169,6 @@
list("antitoxins", "anti_toxin", 0, 0),
list("nutrients", "glucose", 0, 0),
list("hyronalin", "hyronalin", 0, 0),
list("radium", "radium", 0, 0),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 0),
list("clotting agent", "myelamine", 0, 0)
)
@@ -150,7 +150,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
list("radium", "radium", 0, 80)
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
var/max_reagent_volume = 80 //Used when refilling.
@@ -170,7 +170,7 @@
list("clotting agent", "myelamine", 0, 30),
list("peridaxon", "peridaxon", 0, 30),
list("hyronalin", "hyronalin", 0, 30),
list("radium", "radium", 0, 30)
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
/obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user)
@@ -286,7 +286,7 @@
list("antitoxins", "anti_toxin", 0, 80),
list("nutrients", "glucose", 0, 80),
list("hyronalin", "hyronalin", 0, 80),
list("radium", "radium", 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
list("clotting agent", "myelamine", 0, 80)
)
+3 -3
View File
@@ -168,8 +168,8 @@
//rag must have a minimum of 2 units welder fuel or ehtanol based reagents and at least 80% of the reagents must so.
/obj/item/reagent_containers/glass/rag/proc/can_ignite()
var/fuel
if(reagents.get_reagent_amount("fuel"))
fuel += reagents.get_reagent_amount("fuel")
if(reagents.get_reagent_amount(REAGENT_ID_FUEL))
fuel += reagents.get_reagent_amount(REAGENT_ID_FUEL)
else
for(var/datum/reagent/ethanol/R in reagents.reagent_list)
@@ -231,7 +231,7 @@
qdel(src)
return
reagents.remove_reagent("fuel", reagents.maximum_volume/25)
reagents.remove_reagent(REAGENT_ID_FUEL, reagents.maximum_volume/25)
for(var/datum/reagent/ethanol/R in reagents.reagent_list)
if(istype(R, /datum/reagent/ethanol))
reagents.remove_reagent(R.id, reagents.maximum_volume/25)
+1 -1
View File
@@ -87,7 +87,7 @@
if(istype(Bait, bait_type))
var/foodvolume
for(var/datum/reagent/re in Bait.reagents.reagent_list)
if(re.id == "nutriment" || re.id == "protein" || re.id == "glucose" || re.id == "fishbait")
if(re.id == REAGENT_ID_NUTRIMENT || re.id == "protein" || re.id == "glucose" || re.id == "fishbait")
foodvolume += re.volume
toolspeed = initial(toolspeed) * 10*(0.01/(0.2*(foodvolume/Bait.reagents.maximum_volume + 0.5))) //VOREStation edit: gives fishing a universal formula because Polaris' doesn't work here. Min value of 1, max value of 1/3, 0.5 at 1/2 filled with bait reagents.
+2 -2
View File
@@ -86,11 +86,11 @@
sipp_mob(target, user, "liquid_protean")
return
if(SPECIES_PROMETHEAN)
sipp_mob(target, user, "nutriment")
sipp_mob(target, user, REAGENT_ID_NUTRIMENT)
return
return ..()
/obj/item/glass_extra/straw/proc/sipp_mob(mob/living/victim, mob/user, reagent_type = "nutriment")
/obj/item/glass_extra/straw/proc/sipp_mob(mob/living/victim, mob/user, reagent_type = REAGENT_ID_NUTRIMENT)
if(victim.health <= 0)
to_chat(user, span_warning("There's not enough of [victim] left to sip on!"))
return
@@ -241,5 +241,5 @@
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/manager_summoner
glass_icon_state = "manager_summoner"
glass_icon_state = REAGENT_ID_MANAGERSUMMONER
glass_icon_file = 'icons/obj/drinks_vr.dmi'
+4 -4
View File
@@ -32,10 +32,10 @@
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/Initialize()
. = ..()
cut_overlays()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("iron", 10)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
reagents.add_reagent(REAGENT_ID_IRON, 10)
reagents.add_reagent("protein", 35)
reagents.add_reagent("water", 25)
reagents.add_reagent(REAGENT_ID_WATER, 25)
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/update_icon()
return
return
+2 -2
View File
@@ -9,7 +9,7 @@
. = ..()
cut_overlays()
reagents.add_reagent("liquid_protean", 50)
reagents.add_reagent("nutriment", 50)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 50)
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/update_icon()
return
return
+25 -25
View File
@@ -41,7 +41,7 @@
/obj/item/reagent_containers/food/drinks/cans/waterbottle/Initialize()
. = ..()
reagents.add_reagent("water", 30)
reagents.add_reagent(REAGENT_ID_WATER, 30)
/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind
name = "\improper Space Mountain Wind"
@@ -278,8 +278,8 @@
/obj/item/reagent_containers/food/drinks/cans/terra_cola/Initialize()
. = ..()
reagents.add_reagent("water", 25)
reagents.add_reagent("iron", 5)
reagents.add_reagent(REAGENT_ID_WATER, 25)
reagents.add_reagent(REAGENT_ID_IRON, 5)
/////////////////////////MISC VENDOR DRINKS/////////////////////////
@@ -365,7 +365,7 @@
/obj/item/reagent_containers/food/drinks/cans/bepis/Initialize()
. = ..()
reagents.add_reagent("bepis", 30)
reagents.add_reagent(REAGENT_ID_BEPIS, 30)
/obj/item/reagent_containers/food/drinks/cans/astrodew
name = "\improper Astro Dew Spring Water"
@@ -376,7 +376,7 @@
/obj/item/reagent_containers/food/drinks/cans/astrodew/Initialize()
. = ..()
reagents.add_reagent("water", 30)
reagents.add_reagent(REAGENT_ID_WATER, 30)
/obj/item/reagent_containers/food/drinks/cans/icecoffee
name = "\improper Café Del Consumir"
@@ -403,7 +403,7 @@
/obj/item/reagent_containers/food/drinks/cans/buzz/Initialize()
. = ..()
reagents.add_reagent("buzz_fuzz", 30)
reagents.add_reagent(REAGENT_ID_BUZZFUZZ, 30)
/obj/item/reagent_containers/food/drinks/cans/shambler
name = "\improper Shambler's Juice"
@@ -414,7 +414,7 @@
/obj/item/reagent_containers/food/drinks/cans/shambler/Initialize()
. = ..()
reagents.add_reagent("shamblers", 30)
reagents.add_reagent(REAGENT_ID_SHAMBLERS, 30)
/obj/item/reagent_containers/food/drinks/cans/cranberry
name = "\improper Sprited Cranberry"
@@ -425,7 +425,7 @@
/obj/item/reagent_containers/food/drinks/cans/cranberry/Initialize()
. = ..()
reagents.add_reagent("sprited_cranberry", 30)
reagents.add_reagent(REAGENT_ID_SPRITEDCRANBERRY, 30)
/////////////////////////CANNED BOOZE DRINKS/////////////////////////
@@ -460,7 +460,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_peach/Initialize()
. = ..()
reagents.add_reagent("nukie_peach", 60)
reagents.add_reagent(REAGENT_ID_NUKIEPEACH, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_pear
name = "\improper Nukies - Great Pear"
@@ -471,7 +471,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_pear/Initialize()
. = ..()
reagents.add_reagent("nukie_pear", 60)
reagents.add_reagent(REAGENT_ID_NUKIEPEAR, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_cherry
name = "\improper Nukies - Popping Cherry"
@@ -482,7 +482,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_cherry/Initialize()
. = ..()
reagents.add_reagent("nukie_cherry", 60)
reagents.add_reagent(REAGENT_ID_NUKIECHERRY, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_melon
name = "\improper Nukies - Melon Squirter"
@@ -493,7 +493,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_melon/Initialize()
. = ..()
reagents.add_reagent("nukie_melon", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMELON, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_banana
name = "\improper Nukies - Bursting Banana"
@@ -504,7 +504,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_banana/Initialize()
. = ..()
reagents.add_reagent("nukie_banana", 60)
reagents.add_reagent(REAGENT_ID_NUKIEBANANA, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_rose
name = "\improper Nukies - Insatiable Rose"
@@ -515,7 +515,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_rose/Initialize()
. = ..()
reagents.add_reagent("nukie_rose", 60)
reagents.add_reagent(REAGENT_ID_NUKIEROSE, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_lemon
name = "\improper Nukies - Citrus Got Real"
@@ -526,7 +526,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_lemon/Initialize()
. = ..()
reagents.add_reagent("nukie_lemon", 60)
reagents.add_reagent(REAGENT_ID_NUKIELEMON, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_fruit
name = "\improper Nukies - Swelling Fruit"
@@ -537,7 +537,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_fruit/Initialize()
. = ..()
reagents.add_reagent("nukie_fruit", 60)
reagents.add_reagent(REAGENT_ID_NUKIEFRUIT, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_special
name = "\improper Nukies - Limited Edition"
@@ -548,7 +548,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_special/Initialize()
. = ..()
reagents.add_reagent("nukie_special", 60)
reagents.add_reagent(REAGENT_ID_NUKIESPECIAL, 60)
/////////////////////////MEGA NUKIES/////////////////////////
//Rare loot energy drinks with special properties, for the funnies.
@@ -562,7 +562,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sight/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_sight", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGASIGHT, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart
name = "\improper Nukies Mega - Juice Pumper"
@@ -573,7 +573,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_heart", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGAHEART, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep
name = "\improper Nukies Nega - Vibrating Nights"
@@ -584,7 +584,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_sleep", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGASLEEP, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock
name = "\improper Nukies Mega - Jolt Railer"
@@ -595,7 +595,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_shock", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGASHOCK, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast
name = "\improper Nukies Mega - Rapid Rager"
@@ -606,7 +606,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_fast", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGAFAST, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_high
name = "\improper Nukies Mega - Diamond Sky"
@@ -617,7 +617,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_high/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_high", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGAHIGH, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink
name = "\improper Nukies Mega - Shrinking Flower"
@@ -628,7 +628,7 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_shrink", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGASHRINK, 60)
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow
name = "\improper Nukies Mega - Growing Geyser"
@@ -639,4 +639,4 @@
/obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow/Initialize()
. = ..()
reagents.add_reagent("nukie_mega_growth", 60)
reagents.add_reagent(REAGENT_ID_NUKIEMEGAGROWTH, 60)
+15 -15
View File
@@ -91,7 +91,7 @@
desc = "Leaves the tongue numb in its passage."
icon_state = "coldsauce"
center_of_mass = list("x"=16, "y"=6)
if("sodiumchloride")
if(REAGENT_ID_SODIUMCHLORIDE)
name = "Salt Shaker"
desc = "Salt. From space oceans, presumably."
icon_state = "saltshaker"
@@ -106,7 +106,7 @@
desc = "A delicious oil used in cooking. General purpose."
icon_state = "oliveoil"
center_of_mass = list("x"=16, "y"=6)
if("sugar")
if(REAGENT_ID_SUGAR)
name = "Sugar"
desc = "Tastey space sugar!"
center_of_mass = list("x"=16, "y"=6)
@@ -166,7 +166,7 @@
/obj/item/reagent_containers/food/condiment/sugar/Initialize()
. = ..()
reagents.add_reagent("sugar", 50)
reagents.add_reagent(REAGENT_ID_SUGAR, 50)
/obj/item/reagent_containers/food/condiment/ketchup/Initialize()
. = ..()
@@ -237,7 +237,7 @@
/obj/item/reagent_containers/food/condiment/small/saltshaker/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 20)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 20)
/obj/item/reagent_containers/food/condiment/small/peppermill //Keeping name here to save map based headaches
name = "pepper shaker"
@@ -260,13 +260,13 @@
reagents.add_reagent("blackpepper", 30)
/obj/item/reagent_containers/food/condiment/small/sugar
name = "sugar"
name = REAGENT_ID_SUGAR
desc = "Sweetness in a bottle"
icon_state = "sugarsmall"
/obj/item/reagent_containers/food/condiment/small/sugar/Initialize()
. = ..()
reagents.add_reagent("sugar", 20)
reagents.add_reagent(REAGENT_ID_SUGAR, 20)
//MRE condiments and drinks.
@@ -284,7 +284,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/salt/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 5)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 5)
/obj/item/reagent_containers/food/condiment/small/packet/pepper
name = "pepper packet"
@@ -302,7 +302,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/sugar/Initialize()
. = ..()
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/condiment/small/packet/jelly
name = "jelly packet"
@@ -495,7 +495,7 @@
/obj/item/reagent_containers/food/condiment/carton/sugar
name = "sugar carton"
desc = "A big carton of sugar. Sweet!"
icon_state = "sugar"
icon_state = REAGENT_ID_SUGAR
volume = 120
center_of_mass = list("x"=16, "y"=8)
@@ -505,7 +505,7 @@
/obj/item/reagent_containers/food/condiment/carton/sugar/Initialize()
. = ..()
reagents.add_reagent("sugar", 100)
reagents.add_reagent(REAGENT_ID_SUGAR, 100)
/obj/item/reagent_containers/food/condiment/carton/sugar/rustic
name = "sugar sack"
@@ -534,7 +534,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/Initialize()
. = ..()
reagents.add_reagent("protein_powder", 5)
reagents.add_reagent(REAGENT_ID_PROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/vanilla
name = "vanilla protein powder packet"
@@ -543,7 +543,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/vanilla/Initialize()
. = ..()
reagents.add_reagent("vanilla_protein_powder", 5)
reagents.add_reagent(REAGENT_ID_VANILLAPROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/banana
name = "banana protein powder packet"
@@ -552,7 +552,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/banana/Initialize()
. = ..()
reagents.add_reagent("banana_protein_powder", 5)
reagents.add_reagent(REAGENT_ID_BANANAPROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/chocolate
name = "chocolate protein powder packet"
@@ -561,7 +561,7 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/chocolate/Initialize()
. = ..()
reagents.add_reagent("chocolate_protein_powder", 5)
reagents.add_reagent(REAGENT_ID_CHOCOLATEPROTEINPOWDER, 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/strawberry
name = "strawberry protein powder packet"
@@ -570,4 +570,4 @@
/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/strawberry/Initialize()
. = ..()
reagents.add_reagent("strawberry_protein_powder", 5)
reagents.add_reagent(REAGENT_ID_STRAWBERRYPROTEINPOWDER, 5)
@@ -157,7 +157,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake/Initialize()
. = ..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("iron", 10)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
reagents.add_reagent(REAGENT_ID_IRON, 10)
reagents.add_reagent("protein", 15)
reagents.add_reagent("water", 45)
reagents.add_reagent(REAGENT_ID_WATER, 45)
+125 -125
View File
@@ -53,7 +53,7 @@
/obj/item/reagent_containers/food/snacks/Initialize()
. = ..()
if(nutriment_amt)
reagents.add_reagent("nutriment",(nutriment_amt*2),nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT,(nutriment_amt*2),nutriment_desc)
//Placeholder for effect that trigger on eating that aren't tied to reagents.
/obj/item/reagent_containers/food/snacks/proc/On_Consume(var/mob/living/M)
@@ -116,7 +116,7 @@
var/swallow_whole = FALSE
var/obj/belly/belly_target // These are surprise tools that will help us later
var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
var/fullness = M.nutrition + (M.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) * 25)
if(M == user) //If you're eating it yourself
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
@@ -460,7 +460,7 @@
/obj/item/reagent_containers/food/snacks/candy/donor/Initialize()
. = ..()
reagents.add_reagent("sugar", 3)
reagents.add_reagent(REAGENT_ID_SUGAR, 3)
/obj/item/reagent_containers/food/snacks/candy_corn
name = "candy corn"
@@ -475,7 +475,7 @@
/obj/item/reagent_containers/food/snacks/candy_corn/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
/obj/item/reagent_containers/food/snacks/chocolatebar //not a vending item
name = "Chocolate Bar"
@@ -489,7 +489,7 @@
/obj/item/reagent_containers/food/snacks/chocolatebar/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
reagents.add_reagent("coco", 2)
/obj/item/reagent_containers/food/snacks/chocolatepiece
@@ -527,7 +527,7 @@
/obj/item/reagent_containers/food/snacks/chocolateegg/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
reagents.add_reagent("coco", 2)
/obj/item/reagent_containers/food/snacks/donut
@@ -548,7 +548,7 @@
desc = "A plain ol' donut."
/obj/item/reagent_containers/food/snacks/donut/plain/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/plain/jelly
name = "plain jelly donut"
@@ -556,7 +556,7 @@
desc = "At least this one has jelly!"
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/pink
@@ -566,7 +566,7 @@
overlay_state = "donut_pink_inbox"
/obj/item/reagent_containers/food/snacks/donut/pink/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/pink/jelly
name = "pink frosted jelly donut"
@@ -574,7 +574,7 @@
desc = "This one has pink frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/pink/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/purple
@@ -584,7 +584,7 @@
overlay_state = "donut_purple_inbox"
/obj/item/reagent_containers/food/snacks/donut/purple/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/purple/jelly
name = "purple frosted jelly donut"
@@ -592,7 +592,7 @@
desc = "This one has purple frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/purple/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/green
@@ -602,7 +602,7 @@
overlay_state = "donut_green_inbox"
/obj/item/reagent_containers/food/snacks/donut/green/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/green/jelly
name = "green frosted jelly donut"
@@ -610,7 +610,7 @@
desc = "This one has green frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/green/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/beige
@@ -620,7 +620,7 @@
overlay_state = "donut_beige_inbox"
/obj/item/reagent_containers/food/snacks/donut/beige/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/beige/jelly
name = "beige frosted jelly donut"
@@ -628,7 +628,7 @@
desc = "This one has beige frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/beige/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/choc
@@ -638,7 +638,7 @@
overlay_state = "donut_choc_inbox"
/obj/item/reagent_containers/food/snacks/donut/choc/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("chocolate", 5)
/obj/item/reagent_containers/food/snacks/donut/choc/jelly
@@ -647,7 +647,7 @@
desc = "This one has chocolate frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/choc/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
reagents.add_reagent("chocolate", 5)
@@ -658,7 +658,7 @@
overlay_state = "donut_blue_inbox"
/obj/item/reagent_containers/food/snacks/donut/blue/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/blue/jelly
name = "blue frosted jelly donut"
@@ -666,7 +666,7 @@
desc = "This one has blue frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/blue/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/yellow
@@ -676,7 +676,7 @@
overlay_state = "donut_yellow_inbox"
/obj/item/reagent_containers/food/snacks/donut/yellow/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/yellow/jelly
name = "yellow frosted jelly donut"
@@ -684,7 +684,7 @@
desc = "This one has yellow frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/yellow/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/olive
@@ -694,7 +694,7 @@
overlay_state = "donut_olive_inbox"
/obj/item/reagent_containers/food/snacks/donut/olive/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/olive/jelly
name = "olive frosted jelly donut"
@@ -702,7 +702,7 @@
desc = "This one has olive frosting and a jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/olive/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
/obj/item/reagent_containers/food/snacks/donut/homer
@@ -712,7 +712,7 @@
overlay_state = "donut_homer_inbox"
/obj/item/reagent_containers/food/snacks/donut/homer/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
/obj/item/reagent_containers/food/snacks/donut/homer/jelly
@@ -721,7 +721,7 @@
desc = "It's a d'ohnut with jelly filling!"
/obj/item/reagent_containers/food/snacks/donut/homer/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("berryjuice", 5)
@@ -732,7 +732,7 @@
overlay_state = "donut_choc_sprinkles_inbox"
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("chocolate", 1)
@@ -742,7 +742,7 @@
desc = "Pretty sure this is the most sugar you can pack into a donut."
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("berryjuice", 5)
reagents.add_reagent("chocolate", 1)
@@ -763,7 +763,7 @@
overlay_state = "donut_laugh_inbox"
/obj/item/reagent_containers/food/snacks/donut/laugh/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/donut/laugh/jelly
name = "laugh jelly donut"
@@ -771,7 +771,7 @@
desc = "Try not to be jelly."
/obj/item/reagent_containers/food/snacks/donut/laugh/jelly/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
reagents.add_reagent("berryjuice", 5)
@@ -789,7 +789,7 @@
reagents.add_reagent("sprinkles", 1)
switch(rand(1,10))
if(1)
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
if(2)
reagents.add_reagent("capsaicin", 3)
if(3)
@@ -909,7 +909,7 @@
/obj/item/reagent_containers/food/snacks/friedegg/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("blackpepper", 1)
/obj/item/reagent_containers/food/snacks/boiledegg
@@ -1016,7 +1016,7 @@
/obj/item/reagent_containers/food/snacks/crab_legs/Initialize()
. = ..()
reagents.add_reagent("seafood", 6)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/fishfingers
name = "Fish Fingers"
@@ -1054,7 +1054,7 @@
/obj/item/reagent_containers/food/snacks/mushroomslice/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 3)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
/obj/item/reagent_containers/food/snacks/tomatomeat
name = "tomato slice"
@@ -1090,7 +1090,7 @@
/obj/item/reagent_containers/food/snacks/xenomeat/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("pacid",6)
reagents.add_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
name = "spider meat"
@@ -1102,8 +1102,8 @@
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize()
. = ..()
reagents.add_reagent("spidertoxin",6)
reagents.remove_reagent("pacid",6)
reagents.add_reagent(REAGENT_ID_SPIDERTOXIN,6)
reagents.remove_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/meatball
name = "meatball"
@@ -1212,7 +1212,7 @@
icon_state = "dankpocket"
nutriment_amt = 2
nutriment_desc = list("heartiness" = 1, "dough" = 2)
heated_reagents = list("bliss" = 5)
heated_reagents = list(REAGENT_ID_BLISS = 5)
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket
name = "\improper Sin-pocket"
@@ -1518,7 +1518,7 @@
/obj/item/reagent_containers/food/snacks/amanita_pie/Initialize()
. = ..()
reagents.add_reagent("amatoxin", 3)
reagents.add_reagent("psilocybin", 1)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 1)
/obj/item/reagent_containers/food/snacks/plump_pie
name = "plump pie"
@@ -1535,7 +1535,7 @@
if(prob(10))
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
reagents.add_reagent("nutriment", 8, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 8, nutriment_desc)
reagents.add_reagent("tricordrazine", 5)
/obj/item/reagent_containers/food/snacks/xemeatpie
@@ -1752,7 +1752,7 @@
/obj/item/reagent_containers/food/snacks/blackpudding/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
reagents.add_reagent("blood", 5)
reagents.add_reagent(REAGENT_ID_BLOOD, 5)
/obj/item/reagent_containers/food/snacks/soydope
name = "Soy Dope"
@@ -1786,7 +1786,7 @@
/obj/item/reagent_containers/food/snacks/badrecipe/Initialize()
. = ..()
reagents.add_reagent("toxin", 1)
reagents.add_reagent("carbon", 3)
reagents.add_reagent(REAGENT_ID_CARBON, 3)
/obj/item/reagent_containers/food/snacks/meatsteak
name = "Meat steak"
@@ -1800,7 +1800,7 @@
/obj/item/reagent_containers/food/snacks/meatsteak/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("blackpepper", 1)
/obj/item/reagent_containers/food/snacks/spacylibertyduff
@@ -1816,7 +1816,7 @@
/obj/item/reagent_containers/food/snacks/spacylibertyduff/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 6)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 6)
/obj/item/reagent_containers/food/snacks/amanitajelly
name = "Amanita Jelly"
@@ -1832,7 +1832,7 @@
/obj/item/reagent_containers/food/snacks/amanitajelly/Initialize()
. = ..()
reagents.add_reagent("amatoxin", 6)
reagents.add_reagent("psilocybin", 3)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
/obj/item/reagent_containers/food/snacks/poppypretzel
name = "Poppy pretzel"
@@ -1895,7 +1895,7 @@
Expand()
/obj/item/reagent_containers/food/snacks/monkeycube/on_reagent_change()
if(reagents.has_reagent("water"))
if(reagents.has_reagent(REAGENT_ID_WATER))
Expand()
/obj/item/reagent_containers/food/snacks/monkeycube/wrapped
@@ -1981,7 +1981,7 @@
reagents.add_reagent("protein", 10)
reagents.add_reagent("banana", 5)
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/baguette
name = "Baguette"
@@ -1996,7 +1996,7 @@
/obj/item/reagent_containers/food/snacks/baguette/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/fishandchips
name = "Fish and Chips"
@@ -2025,7 +2025,7 @@
/obj/item/reagent_containers/food/snacks/rofflewaffles/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 8)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 8)
/obj/item/reagent_containers/food/snacks/jelliedtoast
name = "Jellied Toast"
@@ -2290,7 +2290,7 @@
/obj/item/reagent_containers/food/snacks/toastedsandwich/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("carbon", 2)
reagents.add_reagent(REAGENT_ID_CARBON, 2)
/obj/item/reagent_containers/food/snacks/grilledcheese
name = "Grilled Cheese Sandwich"
@@ -2358,7 +2358,7 @@
if(prob(10))
name = "exceptional plump helmet biscuit"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
reagents.add_reagent("nutriment", 3, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc)
/obj/item/reagent_containers/food/snacks/chawanmushi
name = "chawanmushi"
@@ -2431,7 +2431,7 @@
/obj/item/reagent_containers/food/snacks/meatballsoup/Initialize()
. = ..()
reagents.add_reagent("protein", 8)
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/slimesoup
name = "slime soup"
@@ -2444,7 +2444,7 @@
/obj/item/reagent_containers/food/snacks/slimesoup/Initialize()
. = ..()
reagents.add_reagent("slimejelly", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/food/snacks/bloodsoup
name = "Tomato soup"
@@ -2458,8 +2458,8 @@
/obj/item/reagent_containers/food/snacks/bloodsoup/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
reagents.add_reagent("blood", 10)
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_BLOOD, 10)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/clownstears
name = JOB_CLOWN + "'s Tears"
@@ -2475,7 +2475,7 @@
/obj/item/reagent_containers/food/snacks/clownstears/Initialize()
. = ..()
reagents.add_reagent("banana", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/food/snacks/vegetablesoup
name = "Vegetable soup"
@@ -2490,7 +2490,7 @@
/obj/item/reagent_containers/food/snacks/vegetablesoup/Initialize()
. = ..()
reagents.add_reagent("vegetable_soup", 10)
reagents.add_reagent(REAGENT_ID_VEGETABLESOUP, 10)
/obj/item/reagent_containers/food/snacks/nettlesoup
name = "Nettle soup"
@@ -2506,7 +2506,7 @@
/obj/item/reagent_containers/food/snacks/nettlesoup/Initialize()
. = ..()
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
reagents.add_reagent("tricordrazine", 5)
/obj/item/reagent_containers/food/snacks/mysterysoup
@@ -2526,37 +2526,37 @@
var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10)
switch(mysteryselect)
if(1)
reagents.add_reagent("nutriment", 6, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent("capsaicin", 3)
reagents.add_reagent("tomatojuice", 2)
if(2)
reagents.add_reagent("nutriment", 6, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent("frostoil", 3)
reagents.add_reagent("tomatojuice", 2)
if(3)
reagents.add_reagent("nutriment", 5, nutriment_desc)
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent(REAGENT_ID_WATER, 5)
reagents.add_reagent("tricordrazine", 5)
if(4)
reagents.add_reagent("nutriment", 5, nutriment_desc)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent(REAGENT_ID_WATER, 10)
if(5)
reagents.add_reagent("nutriment", 2, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2, nutriment_desc)
reagents.add_reagent("banana", 10)
if(6)
reagents.add_reagent("nutriment", 6, nutriment_desc)
reagents.add_reagent("blood", 10)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent(REAGENT_ID_BLOOD, 10)
if(7)
reagents.add_reagent("slimejelly", 10)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
if(8)
reagents.add_reagent("carbon", 10)
reagents.add_reagent(REAGENT_ID_CARBON, 10)
reagents.add_reagent("toxin", 10)
if(9)
reagents.add_reagent("nutriment", 5, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent("tomatojuice", 10)
if(10)
reagents.add_reagent("nutriment", 6, nutriment_desc)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
@@ -2572,10 +2572,10 @@
/obj/item/reagent_containers/food/snacks/wishsoup/Initialize()
. = ..()
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
if(prob(25))
src.desc = "A wish come true!"
reagents.add_reagent("nutriment", 8, list("something good" = 8))
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 8, list("something good" = 8))
/obj/item/reagent_containers/food/snacks/tomatosoup
name = "Tomato Soup"
@@ -2589,7 +2589,7 @@
/obj/item/reagent_containers/food/snacks/tomatosoup/Initialize()
. = ..()
reagents.add_reagent("tomato_soup", 10)
reagents.add_reagent(REAGENT_ID_TOMATOSOUP, 10)
/obj/item/reagent_containers/food/snacks/mushroomsoup
name = "chantrelle soup"
@@ -2603,7 +2603,7 @@
/obj/item/reagent_containers/food/snacks/mushroomsoup/Initialize()
. = ..()
reagents.add_reagent("mushroom_soup", 10)
reagents.add_reagent(REAGENT_ID_MUSHROOMSOUP, 10)
/obj/item/reagent_containers/food/snacks/beetsoup
name = "beet soup"
@@ -2618,7 +2618,7 @@
/obj/item/reagent_containers/food/snacks/beetsoup/Initialize()
. = ..()
name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
reagents.add_reagent("beet_soup", 10)
reagents.add_reagent(REAGENT_ID_BEETSOUP, 10)
/obj/item/reagent_containers/food/snacks/soup/onion
name = "onion soup"
@@ -2632,7 +2632,7 @@
/obj/item/reagent_containers/food/snacks/soup/onion/Initialize()
. = ..()
reagents.add_reagent("onion_soup", 10)
reagents.add_reagent(REAGENT_ID_ONIONSOUP, 10)
/obj/item/reagent_containers/food/snacks/chickennoodlesoup
name = "chicken noodle soup"
@@ -2644,7 +2644,7 @@
/obj/item/reagent_containers/food/snacks/chickennoodlesoup/Initialize()
. = ..()
reagents.add_reagent("chicken_noodle_soup", 10)
reagents.add_reagent(REAGENT_ID_CHICKENNOODLESOUP, 10)
/obj/item/reagent_containers/food/snacks/stew
name = "Stew"
@@ -2664,7 +2664,7 @@
reagents.add_reagent("protein", 4)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/bearstew
name = "bear stew"
@@ -2684,7 +2684,7 @@
reagents.add_reagent("hyperzine", 5)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/hotchili
@@ -3435,7 +3435,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
reagents.add_reagent("ambrosia_extract", 2)
reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2)
reagents.add_reagent("bicaridine", 1)
reagents.add_reagent("kelotane", 1)
reagents.add_reagent("toxin", 1)
@@ -3503,7 +3503,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/buchedenoel/Initialize()
. = ..()
reagents.add_reagent("sugar", 9)
reagents.add_reagent(REAGENT_ID_SUGAR, 9)
reagents.add_reagent("coco", 5)
/obj/item/reagent_containers/food/snacks/bucheslice
@@ -3531,7 +3531,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("cookingoil", 1)
/obj/item/reagent_containers/food/snacks/turkeyslice
@@ -3561,7 +3561,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
reagents.add_reagent("cookingoil", 1)
/obj/item/reagent_containers/food/snacks/sliceable/turkey/on_slice_extra()
@@ -4039,7 +4039,7 @@
/obj/item/reagent_containers/food/snacks/dionaroast/Initialize()
. = ..()
reagents.add_reagent("radium", 2)
reagents.add_reagent(REAGENT_ID_RADIUM, 2)
/obj/item/reagent_containers/food/snacks/dough
name = "dough"
@@ -4281,7 +4281,7 @@
reagents.add_reagent("oxycodone", 1)
reagents.add_reagent("sifsap", 5)
reagents.add_reagent("bliss", 5)
reagents.add_reagent(REAGENT_ID_BLISS, 5)
/obj/item/reagent_containers/food/snacks/bellefritter
name = "frostbelle fritters"
@@ -4295,7 +4295,7 @@
/obj/item/reagent_containers/food/snacks/bellefritter/Initialize()
. = ..()
reagents.add_reagent("batter", 10)
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/roastedsunflower
name = "sunflower seeds"
@@ -4333,7 +4333,7 @@
/obj/item/reagent_containers/food/snacks/liquidfood/Initialize()
. = ..()
reagents.add_reagent("iron", 3)
reagents.add_reagent(REAGENT_ID_IRON, 3)
/obj/item/reagent_containers/food/snacks/liquidprotein
name = "\improper LiquidProtein Ration"
@@ -4349,7 +4349,7 @@
/obj/item/reagent_containers/food/snacks/liquidprotein/Initialize()
. = ..()
reagents.add_reagent("protein", 30)
reagents.add_reagent("iron", 3)
reagents.add_reagent(REAGENT_ID_IRON, 3)
/obj/item/reagent_containers/food/snacks/liquidvitamin
name = "\improper VitaPaste Ration"
@@ -4368,7 +4368,7 @@
reagents.add_reagent("tricordrazine", 5)
reagents.add_reagent("paracetamol", 5)
reagents.add_reagent("enzyme", 1)
reagents.add_reagent("iron", 3)
reagents.add_reagent(REAGENT_ID_IRON, 3)
/obj/item/reagent_containers/food/snacks/meatcube
name = "cubed meat"
@@ -4564,7 +4564,7 @@
icon_state = "rosesalad"
filling_color = "#FF3867"
nutriment_amt = 10
nutriment_desc = list("bittersweet" = 10, "iron" = 5)
nutriment_desc = list("bittersweet" = 10, REAGENT_ID_IRON = 5)
bitesize = 4
/obj/item/reagent_containers/food/snacks/rosesalad/Initialize()
@@ -4919,7 +4919,7 @@
// composition_reagent = "slimejelly"
/mob/living/carbon/alien/diona
composition_reagent = "nutriment"//Dionae are plants, so eating them doesn't give animal protein
composition_reagent = REAGENT_ID_NUTRIMENT//Dionae are plants, so eating them doesn't give animal protein
/mob/living/simple_mob/slime
composition_reagent = "slimejelly"
@@ -5009,7 +5009,7 @@
/obj/item/reagent_containers/food/snacks/funnelcake/Initialize()
. = ..()
reagents.add_reagent("batter", 10)
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/spreads
name = "nutri-spread"
@@ -5031,7 +5031,7 @@
/obj/item/reagent_containers/food/snacks/spreads/Initialize()
. = ..()
reagents.add_reagent("triglyceride", 20)
reagents.add_reagent("sodiumchloride",1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE,1)
/obj/item/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/material/knife))
@@ -6190,7 +6190,7 @@
/obj/item/reagent_containers/food/snacks/candy/Initialize()
. = ..()
reagents.add_reagent("sugar", 3)
reagents.add_reagent(REAGENT_ID_SUGAR, 3)
/obj/item/reagent_containers/food/snacks/namagashi
name = "\improper Ryo-kucha Namagashi"
@@ -6206,7 +6206,7 @@
/obj/item/reagent_containers/food/snacks/namagashi/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
/obj/item/reagent_containers/food/snacks/candy/proteinbar
name = "\improper SwoleMAX protein bar"
@@ -6222,7 +6222,7 @@
/obj/item/reagent_containers/food/snacks/candy/proteinbar/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("sugar", 4)
reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/obj/item/reagent_containers/food/snacks/candy/gummy
name = "\improper AlliCo Gummies"
@@ -6237,7 +6237,7 @@
/obj/item/reagent_containers/food/snacks/candy/gummy/Initialize()
. = ..()
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/cookiesnack
name = "Carps Ahoy! miniature cookies"
@@ -6259,12 +6259,12 @@
icon_state = "fruitbar"
trash = /obj/item/trash/candy/fruitbar
nutriment_amt = 13
nutriment_desc = list("apricot" = 2, "sugar" = 2, "dates" = 2, "cranberry" = 2, "apple" = 2)
nutriment_desc = list("apricot" = 2, REAGENT_ID_SUGAR = 2, "dates" = 2, "cranberry" = 2, "apple" = 2)
bitesize = 6
/obj/item/reagent_containers/food/snacks/fruitbar/Initialize()
. = ..()
reagents.add_reagent("sugar", 4)
reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/////////////////////////////////////////////////////////////////////////////
//////////////////////////////Candy Bars (1-10)//////////////////////////////
@@ -6285,7 +6285,7 @@
/obj/item/reagent_containers/food/snacks/cb01/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb02
name = "\improper Hundred-Thousand Thaler Bar"
@@ -6302,7 +6302,7 @@
/obj/item/reagent_containers/food/snacks/cb02/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb03
name = "\improper Aerostat Bar"
@@ -6319,7 +6319,7 @@
/obj/item/reagent_containers/food/snacks/cb03/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb04
name = "\improper Lars' Saltlakris"
@@ -6336,7 +6336,7 @@
/obj/item/reagent_containers/food/snacks/cb04/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb05
name = "\improper Andromeda Bar"
@@ -6353,7 +6353,7 @@
/obj/item/reagent_containers/food/snacks/cb05/Initialize()
. = ..()
reagents.add_reagent("sugar", 3)
reagents.add_reagent(REAGENT_ID_SUGAR, 3)
/obj/item/reagent_containers/food/snacks/cb06
name = "\improper Mocha Crunch"
@@ -6370,7 +6370,7 @@
/obj/item/reagent_containers/food/snacks/cb06/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
reagents.add_reagent("coffee", 1)
/obj/item/reagent_containers/food/snacks/cb07
@@ -6388,7 +6388,7 @@
/obj/item/reagent_containers/food/snacks/cb07/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
/obj/item/reagent_containers/food/snacks/cb08
name = "\improper Cronk Bar"
@@ -6405,7 +6405,7 @@
/obj/item/reagent_containers/food/snacks/cb08/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
/obj/item/reagent_containers/food/snacks/cb09
name = "\improper Kaju Mamma! Bar"
@@ -6422,7 +6422,7 @@
/obj/item/reagent_containers/food/snacks/cb09/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
reagents.add_reagent("milk", 1)
reagents.add_reagent("peanutoil", 1)
@@ -6441,7 +6441,7 @@
/obj/item/reagent_containers/food/snacks/cb10/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent(REAGENT_ID_SUGAR, 1)
reagents.add_reagent("protein", 1)
reagents.add_reagent("peanutoil", 1)
@@ -6664,7 +6664,7 @@
//
///obj/item/reagent_containers/food/snacks/spacetwinkie/Initialize()
// . = ..()
// reagents.add_reagent("sugar", 4)
// reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/obj/item/reagent_containers/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
@@ -6936,12 +6936,12 @@
/obj/item/reagent_containers/food/snacks/old/Initialize()
.=..()
reagents.add_reagent(pick(list(
"fuel",
REAGENT_ID_FUEL,
"amatoxin",
"carpotoxin",
"zombiepowder",
"cryptobiolin",
"psilocybin")), 5)
REAGENT_ID_PSILOCYBIN)), 5)
reagents.add_reagent("salmonella", 5)
/obj/item/reagent_containers/food/snacks/old/pizza
@@ -6997,7 +6997,7 @@
/obj/item/reagent_containers/food/snacks/canned/beef/Initialize()
.=..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("sodiumchloride", 2)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2)
/obj/item/reagent_containers/food/snacks/canned/beans
name = "baked beans"
@@ -7027,7 +7027,7 @@
/obj/item/reagent_containers/food/snacks/canned/tomato/Initialize()
.=..()
reagents.add_reagent("tomato_soup", 12)
reagents.add_reagent(REAGENT_ID_TOMATOSOUP, 12)
/obj/item/reagent_containers/food/snacks/canned/spinach
name = "spinach"
@@ -7044,7 +7044,7 @@
.=..()
reagents.add_reagent("adrenaline", 4)
reagents.add_reagent("hyperzine", 4)
reagents.add_reagent("iron", 4)
reagents.add_reagent(REAGENT_ID_IRON, 4)
//////////////////////////////Advanced Canned Food//////////////////////////////
@@ -7092,7 +7092,7 @@
/obj/item/reagent_containers/food/snacks/canned/maps/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("sodiumchloride", 2)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2)
/obj/item/reagent_containers/food/snacks/canned/appleberry
name = "\improper Appleberry Bits"
@@ -7108,7 +7108,7 @@
/obj/item/reagent_containers/food/snacks/canned/appleberry/Initialize()
. = ..()
reagents.add_reagent("milk", 8)
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
/obj/item/reagent_containers/food/snacks/canned/ntbeans
name = "baked beans"
@@ -7137,7 +7137,7 @@
filling_color = "#caa3c9"
center_of_mass = list("x"=15, "y"=9)
bitesize = 2
var/brainmeat = "brain_protein"
var/brainmeat = REAGENT_ID_BRAINPROTEIN
/obj/item/reagent_containers/food/snacks/canned/brainzsnax/Initialize()
. = ..()
@@ -7155,7 +7155,7 @@
filling_color = "#a6898d"
center_of_mass = list("x"=15, "y"=9)
bitesize = 2
brainmeat = "red_brain_protein"
brainmeat = REAGENT_ID_REDBRAINPROTEIN
//////////////Packaged Food - break open and eat//////////////
@@ -7221,7 +7221,7 @@
/obj/item/reagent_containers/food/snacks/packaged/spacetwinkie/Initialize()
. = ..()
reagents.add_reagent("sugar", 4)
reagents.add_reagent(REAGENT_ID_SUGAR, 4)
/obj/item/reagent_containers/food/snacks/packaged/genration
name = "generic ration"
@@ -7277,7 +7277,7 @@
/obj/item/reagent_containers/food/snacks/packaged/sweetration/Initialize()
. = ..()
reagents.add_reagent("sugar", 6)
reagents.add_reagent(REAGENT_ID_SUGAR, 6)
/obj/item/reagent_containers/food/snacks/packaged/vendburger
name = "packaged burger"
@@ -7290,7 +7290,7 @@
/obj/item/reagent_containers/food/snacks/packaged/vendburger/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/packaged/vendhotdog
name = "packaged hotdog"
@@ -7303,7 +7303,7 @@
/obj/item/reagent_containers/food/snacks/packaged/vendhotdog/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
/obj/item/reagent_containers/food/snacks/packaged/vendburrito
name = "packaged burrito"
@@ -7316,4 +7316,4 @@
/obj/item/reagent_containers/food/snacks/packaged/vendburrito/Initialize()
. = ..()
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1)
+4 -4
View File
@@ -80,7 +80,7 @@
/obj/item/reagent_containers/food/snacks/hugemushroomslice/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 3)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
/obj/item/reagent_containers/food/snacks/tomatomeat
name = "tomato slice"
@@ -116,7 +116,7 @@
/obj/item/reagent_containers/food/snacks/xenomeat/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("pacid",6)
reagents.add_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
name = "insect meat"
@@ -128,8 +128,8 @@
/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize()
. = ..()
reagents.add_reagent("spidertoxin",6)
reagents.remove_reagent("pacid",6)
reagents.add_reagent(REAGENT_ID_SPIDERTOXIN,6)
reagents.remove_reagent(REAGENT_ID_PACID,6)
/obj/item/reagent_containers/food/snacks/rawturkey
name = "raw turkey"
+26 -26
View File
@@ -38,7 +38,7 @@
/obj/item/reagent_containers/food/snacks/goulash/Initialize()
. = ..()
reagents.add_reagent("protein", 3) //For meaty things.
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/donerkebab
@@ -79,7 +79,7 @@
/obj/item/reagent_containers/food/snacks/reishicup/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 3)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3)
bitesize = 6
/obj/item/storage/box/wings //This is kinda like the donut box.
@@ -134,7 +134,7 @@
/obj/item/reagent_containers/food/snacks/hotandsoursoup/Initialize()
. = ..()
bitesize = 2
reagents.add_reagent("hot_n_sour_soup", 10)
reagents.add_reagent(REAGENT_ID_HOTNSOURSOUP, 10)
/obj/item/reagent_containers/food/snacks/kitsuneudon
name = "kitsune udon"
@@ -178,7 +178,7 @@
/obj/item/reagent_containers/food/snacks/bugball/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("carbon", 5)
reagents.add_reagent(REAGENT_ID_CARBON, 5)
bitesize = 7
/obj/item/reagent_containers/food/snacks/pillbug
@@ -207,7 +207,7 @@
/obj/item/reagent_containers/food/snacks/pillbug/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("carbon", 5)
reagents.add_reagent(REAGENT_ID_CARBON, 5)
bitesize = 3
/obj/item/reagent_containers/food/snacks/mammi
@@ -263,7 +263,7 @@
bitesize = 5
reagents.add_reagent("protein", 20)
reagents.add_reagent("tricordrazine", 5)
reagents.add_reagent("iron", 5)
reagents.add_reagent(REAGENT_ID_IRON, 5)
/obj/item/reagent_containers/food/snacks/cuttlefish
name = "raw cuttlefish"
@@ -343,7 +343,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/monkfishremains/Initialize()
. = ..()
bitesize = 0.01 //impossible to eat
reagents.add_reagent("carbon", 5)
reagents.add_reagent(REAGENT_ID_CARBON, 5)
/obj/item/reagent_containers/food/snacks/sliceable/sharkchunk
name = "chunk of shark meat"
@@ -472,14 +472,14 @@
qdel(src)
/obj/item/reagent_containers/food/snacks/cube/on_reagent_change()
if(reagents.has_reagent("water"))
if(reagents.has_reagent(REAGENT_ID_WATER))
Expand()
/obj/item/reagent_containers/food/snacks/cube/protein
/obj/item/reagent_containers/food/snacks/cube/protein/Initialize()
. = ..()
reagents.add_reagent("meatcolony", 5)
reagents.add_reagent(REAGENT_ID_MEATCOLONY, 5)
/obj/item/reagent_containers/food/snacks/proteinslab
name = "Protein slab"
@@ -502,7 +502,7 @@
/obj/item/reagent_containers/food/snacks/cube/nutriment/Initialize()
. = ..()
reagents.add_reagent("plantcolony", 5)
reagents.add_reagent(REAGENT_ID_PLANTCOLONY, 5)
/obj/item/reagent_containers/food/snacks/nutrimentslab
name = "Nutriment slab"
@@ -561,7 +561,7 @@
/obj/item/reagent_containers/food/snacks/nachos/Initialize()
. = ..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 1)
bitesize = 1
/obj/item/reagent_containers/food/snacks/cheesenachos
@@ -573,7 +573,7 @@
/obj/item/reagent_containers/food/snacks/cheesenachos/Initialize()
. = ..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5)
reagents.add_reagent("protein", 2)
bitesize = 2
@@ -590,7 +590,7 @@
/obj/item/reagent_containers/food/snacks/milosoup/Initialize()
. = ..()
reagents.add_reagent("water", 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/onionsoup
name = "Onion Soup"
@@ -604,7 +604,7 @@
/obj/item/reagent_containers/food/snacks/onionsoup/Initialize()
. = ..()
reagents.add_reagent("onion_soup", 10)
reagents.add_reagent(REAGENT_ID_ONIONSOUP, 10)
//Fennec foods
/obj/item/storage/box/wings/bucket
@@ -691,7 +691,7 @@
/obj/item/reagent_containers/food/snacks/scorpion_cooked/Initialize()
. = ..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2)
reagents.add_reagent("protein", 4)
bitesize = 4
@@ -736,7 +736,7 @@
/obj/item/reagent_containers/food/snacks/honey_candy/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
reagents.add_reagent(REAGENT_ID_SUGAR, 2)
bitesize = 2
/obj/item/reagent_containers/food/snacks/locust
@@ -981,28 +981,28 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
nutriment_desc = list("sugar" = 5, "berry" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "berry" = 2)
/obj/item/reagent_containers/food/snacks/winegum/orange
icon_state = "winegum_orange"
nutriment_desc = list("sugar" = 5, "orange" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "orange" = 2)
/obj/item/reagent_containers/food/snacks/winegum/black
icon_state = "winegum_black"
nutriment_desc = list("sugar" = 5, "berry" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "berry" = 2)
/obj/item/reagent_containers/food/snacks/winegum/green
icon_state = "winegum_green"
nutriment_desc = list("sugar" = 5, "lime" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lime" = 2)
/obj/item/reagent_containers/food/snacks/winegum/yellow
icon_state = "winegum_yellow"
nutriment_desc = list("sugar" = 5, "lemon" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lemon" = 2)
/obj/item/reagent_containers/food/snacks/winegum/white
icon_state = "winegum_white"
nutriment_desc = list("sugar" = 5, "pineapplejuice" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "pineapplejuice" = 2)
/obj/item/storage/box/winegum //This is kinda like the donut box.
name = "Desatti Wine Gums"
@@ -1044,7 +1044,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
nutriment_desc = list("sugar" = 5)
nutriment_desc = list(REAGENT_ID_SUGAR = 5)
var/list/color_options = list("saucer_pink","saucer_blue","saucer_orange","saucer_green","saucer_yellow")
/obj/item/reagent_containers/food/snacks/saucer/Initialize()
@@ -1149,7 +1149,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
nutriment_desc = list("sugar" = 5, "banana" = 3)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "banana" = 3)
/obj/item/reagent_containers/food/snacks/foam_shrimp
name = "Foam Shrimp"
@@ -1159,7 +1159,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
nutriment_desc = list("sugar" = 5, "strawberry" = 3)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "strawberry" = 3)
/obj/item/storage/box/shrimpsandbananas //This is kinda like the donut box.
name = "Shrimps and Bananas"
@@ -1184,7 +1184,7 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
bitesize = 2
nutriment_desc = list("sugar" = 5, "rhubarb" = 2, "custard" = 2)
nutriment_desc = list(REAGENT_ID_SUGAR = 5, "rhubarb" = 2, "custard" = 2)
var/list/color_options = list("rhubarbcustard_1","rhubarbcustard_2")
/obj/item/reagent_containers/food/snacks/rhubarbcustard/Initialize()
+13 -13
View File
@@ -1,7 +1,7 @@
// Chaos cake
/datum/recipe/chaoscake_layerone
reagents = list("flour" = 30,"milk" = 20, "sugar" = 10, "egg" = 9)
reagents = list("flour" = 30,"milk" = 20, REAGENT_ID_SUGAR = 10, "egg" = 9)
fruit = list("poisonberries" = 2, "cherries" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/meat/,
@@ -12,7 +12,7 @@
result = /obj/structure/chaoscake
/datum/recipe/chaoscake_layertwo
reagents = list("flour" = 30, "milk" = 20, "sugar" = 10, "egg" = 9, )
reagents = list("flour" = 30, "milk" = 20, REAGENT_ID_SUGAR = 10, "egg" = 9, )
fruit = list("vanilla" = 2, "banana" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -23,7 +23,7 @@
result = /obj/item/chaoscake_layer
/datum/recipe/chaoscake_layerthree
reagents = list("flour" = 25, "milk" = 15, "sugar" = 10, "egg" = 6, "deathbell" = 10)
reagents = list("flour" = 25, "milk" = 15, REAGENT_ID_SUGAR = 10, "egg" = 6, "deathbell" = 10)
fruit = list("grapes" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -33,7 +33,7 @@
result = /obj/item/chaoscake_layer/three
/datum/recipe/chaoscake_layerfour
reagents = list("flour" = 25, "milk" = 15, "sugar" = 10, "egg" = 6, "milkshake" = 30)
reagents = list("flour" = 25, "milk" = 15, REAGENT_ID_SUGAR = 10, "egg" = 6, "milkshake" = 30)
fruit = list("rice" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -43,13 +43,13 @@
result = /obj/item/chaoscake_layer/four
/datum/recipe/chaoscake_layerfive
reagents = list("flour" = 20, "milk" = 10, "sugar" = 10, "egg" = 6, "blood" = 30)
reagents = list("flour" = 20, "milk" = 10, REAGENT_ID_SUGAR = 10, "egg" = 6, REAGENT_ID_BLOOD = 30)
fruit = list("tomato" = 2)
items = list() //supposed to be made with lobster, still has to be ported.
result = /obj/item/chaoscake_layer/five
/datum/recipe/chaoscake_layersix
reagents = list("flour" = 20, "milk" = 10, "sugar" = 10, "egg" = 6, "sprinkles" = 5)
reagents = list("flour" = 20, "milk" = 10, REAGENT_ID_SUGAR = 10, "egg" = 6, "sprinkles" = 5)
fruit = list("apple" = 2)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -62,7 +62,7 @@
result = /obj/item/chaoscake_layer/six
/datum/recipe/chaoscake_layerseven
reagents = list("flour" = 15, "milk" = 10, "sugar" = 5, "egg" = 3, "devilskiss" = 20)
reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3, "devilskiss" = 20)
fruit = list("potato" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -72,7 +72,7 @@
result = /obj/item/chaoscake_layer/seven
/datum/recipe/chaoscake_layereight
reagents = list("flour" = 15, "milk" = 10, "sugar" = 5, "egg" = 3, "cream" = 20)
reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3, "cream" = 20)
fruit = list("lemon" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -82,7 +82,7 @@
result = /obj/item/chaoscake_layer/eight
/datum/recipe/chaoscake_layernine
reagents = list("water" = 10, "blood" = 10)
reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_BLOOD = 10)
fruit = list("goldapple" = 1)
items = list()
result = /obj/item/chaoscake_layer/nine
@@ -194,24 +194,24 @@
reagents.add_reagent("shockchem", 2)
reagents.add_reagent("amatoxin", 2)
reagents.add_reagent("carpotoxin", 2)
reagents.add_reagent("spidertoxin", 2)
reagents.add_reagent(REAGENT_ID_SPIDERTOXIN, 2)
bitesize = 7
if(2)
name = "Slice Of Evil" //A bad trip
desc = "A mysterious slice, coated in purple frosting that smells like grapes."
nutriment_desc = list("The desire to show off an party" = 10)
reagents.add_reagent("stoxin", 2)
reagents.add_reagent("bliss", 10)
reagents.add_reagent(REAGENT_ID_BLISS, 10)
reagents.add_reagent("serotrotium", 4)
reagents.add_reagent("cryptobiolin", 8)
reagents.add_reagent("mindbreaker", 10)
reagents.add_reagent("psilocybin", 10)
reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 10)
bitesize = 30 //even a single bite won't make you escape fate.
if(3)
name = "Slice Of Evil" //acidic
desc = "A menacing slice, smelling clearly of copper, blood clots float on top."
nutriment_desc = list("Infernal Rage" = 10)
reagents.add_reagent("blood", 20)
reagents.add_reagent(REAGENT_ID_BLOOD, 20)
reagents.add_reagent("stomacid", 10)
reagents.add_reagent("mutagen", 4)
reagents.add_reagent("thirteenloko", 20)
+1 -1
View File
@@ -22,7 +22,7 @@ var/global/ingredientLimit = 20
. = ..()
topping = image(icon,,"[initial(icon_state)]_top")
filling = image(icon,,"[initial(icon_state)]_filling")
src.reagents.add_reagent("nutriment",3)
src.reagents.add_reagent(REAGENT_ID_NUTRIMENT,3)
src.updateName()
return
+2 -2
View File
@@ -147,7 +147,7 @@
desc = "A small bottle. Contains a small amount of Polytrinic Acid"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
prefill = list("pacid" = 60)
prefill = list(REAGENT_ID_PACID = 60)
/obj/item/reagent_containers/glass/bottle/adminordrazine
name = "adminordrazine bottle"
@@ -175,4 +175,4 @@
desc = "A bottle of raw biomass! Gross!"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("biomass" = 60)
prefill = list("biomass" = 60)
+10 -10
View File
@@ -45,7 +45,7 @@
/obj/item/reagent_containers/glass/bottle/potion/lightness
name = "feather weight potion"
desc = "A small green bottle containing some mysterious liquid that claims to make you feel lighter."
prefill = list("ickypak" = 30)
prefill = list(REAGENT_ID_ICKYPAK = 30)
/obj/item/reagent_containers/glass/bottle/potion/SOP
name = "standard operating potion"
@@ -55,12 +55,12 @@
/obj/item/reagent_containers/glass/bottle/potion/shrink
name = "diminution potion"
desc = "A small green bottle containing some swirling cyan liquid that claims to reduce the drinkers stature."
prefill = list("microcillin" = 1)
prefill = list(REAGENT_ID_MICROCILLIN = 1)
/obj/item/reagent_containers/glass/bottle/potion/growth
name = "fire giant potion"
desc = "A small green bottle containing some bubbling yellow liquid that claims to turn the drinker into a fire giant."
prefill = list("macrocillin" = 1, "capsaicin" = 5)
prefill = list(REAGENT_ID_MACROCILLIN = 1, "capsaicin" = 5)
/obj/item/reagent_containers/glass/bottle/potion/pain
name = "grit potion"
@@ -70,12 +70,12 @@
/obj/item/reagent_containers/glass/bottle/potion/faerie
name = "faerie dance potion"
desc = "A small green bottle containing some swishing pink liquid that claims to help you open your mind."
prefill = list("psilocybin" = 30)
prefill = list(REAGENT_ID_PSILOCYBIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/relaxation
name = "relaxation potion"
desc = "A small green bottle containing some still green liquid that claims to make everything feel just fine, really."
prefill = list("ambrosia_extract" = 30)
prefill = list(REAGENT_ID_AMBROSIAEXTRACT = 30)
/obj/item/reagent_containers/glass/bottle/potion/speed
name = "blinding speed potion"
@@ -90,12 +90,12 @@
/obj/item/reagent_containers/glass/bottle/potion/girljuice
name = "girl transformation potion"
desc = "A small green bottle containing some pretty pink liquid that claims to turn the drinker into a woman."
prefill = list("gynorovir" = 1)
prefill = list(REAGENT_ID_GYNOROVIR = 1)
/obj/item/reagent_containers/glass/bottle/potion/boyjuice
name = "boy transformation potion"
desc = "A small green bottle containing some strong blue liquid that claims to turn the drinker into a man."
prefill = list("androrovir" = 1)
prefill = list(REAGENT_ID_ANDROROVIR = 1)
/obj/item/reagent_containers/glass/bottle/potion/badpolymorph
name = "unstable polymorph potion"
@@ -122,17 +122,17 @@
/obj/item/reagent_containers/glass/bottle/potion/plain
name = "plain potion"
desc = "A small green bottle containing some plain transparent liquid."
prefill = list("water" = 30)
prefill = list(REAGENT_ID_WATER = 30)
/obj/item/reagent_containers/glass/bottle/potion/ethanol
name = "thin potion"
desc = "A small green bottle containing some thin transparent liquid with a solvent scent."
prefill = list("ethanol" = 30)
prefill = list(REAGENT_ID_ETHANOL = 30)
/obj/item/reagent_containers/glass/bottle/potion/sugar
name = "sweet potion"
desc = "A small green bottle containing some white translucent liquid with a sweet scent."
prefill = list("sugar" = 30)
prefill = list(REAGENT_ID_SUGAR = 30)
/obj/item/reagent_containers/glass/bottle/potion/capsaicin
name = "warm potion"
+2 -2
View File
@@ -136,14 +136,14 @@
desc = "A small bottle of ickypak. The smell alone makes you gag."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("ickypak" = 60)
prefill = list(REAGENT_ID_ICKYPAK = 60)
/obj/item/reagent_containers/glass/bottle/unsorbitol
name = "unsorbitol bottle"
desc = "A small bottle of unsorbitol. Sickeningly sweet."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("unsorbitol" = 60)
prefill = list(REAGENT_ID_UNSORBITOL = 60)
/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose
name = "glucose container"
@@ -716,16 +716,16 @@
/mob/living/proc/calculate_composition() // moved from devour.dm on aurora's side
if (!composition_reagent)//if no reagent has been set, then we'll set one
if (isSynthetic())
src.composition_reagent = "iron"
src.composition_reagent = REAGENT_ID_IRON
else
if(istype(src, /mob/living/carbon/human/diona) || istype(src, /mob/living/carbon/alien/diona))
src.composition_reagent = "nutriment" // diona are plants, not meat
src.composition_reagent = REAGENT_ID_NUTRIMENT // diona are plants, not meat
else
src.composition_reagent = "protein"
if(istype(src, /mob/living/carbon/human))
var/mob/living/carbon/human/H = src
if(istype(H.species, /datum/species/diona))
src.composition_reagent = "nutriment"
src.composition_reagent = REAGENT_ID_NUTRIMENT
//if the mob is a simple animal - MOB NOT ANIMAL - with a defined meat quantity
if (istype(src, /mob/living/simple_mob))
+1 -1
View File
@@ -209,7 +209,7 @@
var/obj/item/reagent_containers/food/snacks/meat/new_meat = new slab_type(src, rand(3,8))
if(istype(new_meat))
new_meat.name = "[slab_name] [new_meat.name]"
new_meat.reagents.add_reagent("nutriment",slab_nutrition)
new_meat.reagents.add_reagent(REAGENT_ID_NUTRIMENT,slab_nutrition)
if(src.occupant.reagents)
src.occupant.reagents.trans_to_obj(new_meat, round(occupant.reagents.total_volume/(2 + occupant.meat_amount),1))
+5 -5
View File
@@ -30,9 +30,9 @@
if(ICECREAM_BLUE)
return list("milk", "ice", "singulo")
if(CONE_WAFFLE)
return list("flour", "sugar")
return list("flour", REAGENT_ID_SUGAR)
if(CONE_CHOC)
return list("flour", "sugar", "coco")
return list("flour", REAGENT_ID_SUGAR, "coco")
else
return list("milk", "ice")
@@ -58,7 +58,7 @@
product_types.Add(5)
reagents.add_reagent("milk", 5)
reagents.add_reagent("flour", 5)
reagents.add_reagent("sugar", 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
reagents.add_reagent("ice", 5)
/obj/machinery/icecream_vat/attack_hand(mob/user as mob)
@@ -98,7 +98,7 @@
// if(beaker)
// beaker.reagents.trans_to(I, 10)
if(I.reagents.total_volume < 10)
I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume)
I.reagents.add_reagent(REAGENT_ID_SUGAR, 10 - I.reagents.total_volume)
else
to_chat(user, span_warning("There is not enough icecream left!"))
else
@@ -179,7 +179,7 @@
/obj/item/reagent_containers/food/snacks/icecream/New()
create_reagents(20)
reagents.add_reagent("nutriment", 5)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5)
/obj/item/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour_name)
name = "[flavour_name] icecream"
+1 -1
View File
@@ -552,7 +552,7 @@
qdel(H.held_mob)
qdel(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
ffuu.reagents.add_reagent(REAGENT_ID_CARBON, amount)
ffuu.reagents.add_reagent("toxin", amount/10)
return ffuu
+10 -10
View File
@@ -22,7 +22,7 @@
/datum/recipe/risottoballs
appliance = FRYER
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(/obj/item/reagent_containers/food/snacks/risotto)
coating = /datum/reagent/nutriment/coating/batter
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
@@ -32,7 +32,7 @@
/datum/recipe/bellefritter
appliance = FRYER
coating = /datum/reagent/nutriment/coating/batter
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(/obj/item/reagent_containers/food/snacks/frostbelle)
result = /obj/item/reagent_containers/food/snacks/bellefritter
result_quantity = 2
@@ -128,7 +128,7 @@
// All donuts were given reagents of 5 to equal old recipes and make for faster cook times.
/datum/recipe/jellydonut
appliance = FRYER
reagents = list("berryjuice" = 5, "sugar" = 5)
reagents = list("berryjuice" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -136,23 +136,23 @@
result_quantity = 2
/datum/recipe/jellydonut/poisonberry
reagents = list("poisonberryjuice" = 5, "sugar" = 5)
reagents = list("poisonberryjuice" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry
/datum/recipe/jellydonut/slime // Subtypes of jellydonut, appliance inheritance applies.
reagents = list("slimejelly" = 5, "sugar" = 5)
reagents = list("slimejelly" = 5, REAGENT_ID_SUGAR = 5)
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly
/datum/recipe/jellydonut/cherry // Subtypes of jellydonut, appliance inheritance applies.
reagents = list("cherryjelly" = 5, "sugar" = 5)
reagents = list("cherryjelly" = 5, REAGENT_ID_SUGAR = 5)
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly
/datum/recipe/donut
appliance = FRYER
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -161,7 +161,7 @@
/datum/recipe/chaosdonut
appliance = FRYER
reagents = list("frostoil" = 10, "capsaicin" = 10, "sugar" = 10)
reagents = list("frostoil" = 10, "capsaicin" = 10, REAGENT_ID_SUGAR = 10)
reagent_mix = RECIPE_REAGENT_REPLACE //This creates its own reagents
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
@@ -171,7 +171,7 @@
/datum/recipe/funnelcake
appliance = FRYER
reagents = list("sugar" = 5, "batter" = 10)
reagents = list(REAGENT_ID_SUGAR = 5, "batter" = 10)
result = /obj/item/reagent_containers/food/snacks/funnelcake
result_quantity = 2
@@ -185,7 +185,7 @@
//VOREStation Add Start
/datum/recipe/generalschicken
appliance = FRYER
reagents = list("capsaicin" = 2, "sugar" = 2, "batter" = 10)
reagents = list("capsaicin" = 2, REAGENT_ID_SUGAR = 2, "batter" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat
+3 -3
View File
@@ -1,6 +1,6 @@
/datum/recipe/generalschicken
appliance = FRYER
reagents = list("capsaicin" = 2, "sugar" = 2, "batter" = 10)
reagents = list("capsaicin" = 2, REAGENT_ID_SUGAR = 2, "batter" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat
@@ -30,8 +30,8 @@
/datum/recipe/locust
appliance = FRYER
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/locust
)
result = /obj/item/reagent_containers/food/snacks/locust_cooked
result = /obj/item/reagent_containers/food/snacks/locust_cooked
+4 -4
View File
@@ -186,7 +186,7 @@
/datum/recipe/superbiteburger
appliance = GRILL
fruit = list("tomato" = 1)
reagents = list("sodiumchloride" = 5, "blackpepper" = 5)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 5, "blackpepper" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bigbiteburger,
/obj/item/reagent_containers/food/snacks/dough,
@@ -247,17 +247,17 @@
/datum/recipe/omurice/heart
appliance = GRILL
reagents = list("rice" = 5, "ketchup" = 5, "sugar" = 5, "egg" = 3)
reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/omurice/heart
/datum/recipe/omurice/face
appliance = GRILL
reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 1, "egg" = 3)
reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/omurice/face
/datum/recipe/meatsteak
appliance = GRILL
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/meatsteak
+68 -68
View File
@@ -20,14 +20,14 @@ I said no!
*/
/datum/recipe/friedegg
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/egg
)
result = /obj/item/reagent_containers/food/snacks/friedegg
/datum/recipe/boiledegg
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(
/obj/item/reagent_containers/food/snacks/egg
@@ -36,7 +36,7 @@ I said no!
/datum/recipe/devilledegg
fruit = list("chili" = 1)
reagents = list("sodiumchloride" = 2, "mayo" = 5)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "mayo" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
@@ -67,7 +67,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/donkpocket //SPECIAL
/datum/recipe/muffin
reagents = list("milk" = 5, "sugar" = 5)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -146,7 +146,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/cheesymash
/datum/recipe/blackpudding
reagents = list("blood" = 5)
reagents = list(REAGENT_ID_BLOOD = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sausage,
)
@@ -157,7 +157,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/popcorn
/datum/recipe/fortunecookie
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/paper,
@@ -165,16 +165,16 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/fortunecookie
/datum/recipe/syntisteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(/obj/item/reagent_containers/food/snacks/meat/syntiflesh)
result = /obj/item/reagent_containers/food/snacks/meatsteak
/datum/recipe/spacylibertyduff
reagents = list("water" = 5, "vodka" = 5, "psilocybin" = 5)
reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_PSILOCYBIN = 5)
result = /obj/item/reagent_containers/food/snacks/spacylibertyduff
/datum/recipe/amanitajelly
reagents = list("water" = 5, "vodka" = 5, "amatoxin" = 5)
reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, "amatoxin" = 5)
result = /obj/item/reagent_containers/food/snacks/amanitajelly
/datum/recipe/amanitajelly/make_food(var/obj/container as obj)
@@ -184,22 +184,22 @@ I said no!
/datum/recipe/meatballsoup
fruit = list("carrot" = 1, "potato" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/meatball)
result = /obj/item/reagent_containers/food/snacks/meatballsoup
/datum/recipe/vegetablesoup
fruit = list("carrot" = 1, "potato" = 1, "corn" = 1, "eggplant" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/vegetablesoup
/datum/recipe/nettlesoup
fruit = list("nettle" = 1, "potato" = 1)
reagents = list("water" = 10, "egg" = 3)
reagents = list(REAGENT_ID_WATER = 10, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/nettlesoup
/datum/recipe/wishsoup
reagents = list("water" = 20)
reagents = list(REAGENT_ID_WATER = 20)
result= /obj/item/reagent_containers/food/snacks/wishsoup
/datum/recipe/hotchili
@@ -250,11 +250,11 @@ I said no!
/datum/recipe/tomatosoup
fruit = list("tomato" = 2)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/tomatosoup
/datum/recipe/rofflewaffles
reagents = list("psilocybin" = 5, "sugar" = 10)
reagents = list(REAGENT_ID_PSILOCYBIN = 5, REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough,
@@ -264,7 +264,7 @@ I said no!
/datum/recipe/stew
fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/stew
@@ -283,7 +283,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
/datum/recipe/milosoup
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/soydope,
/obj/item/reagent_containers/food/snacks/soydope,
@@ -301,14 +301,14 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/stewedsoymeat
/datum/recipe/boiledspagetti
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
)
result = /obj/item/reagent_containers/food/snacks/boiledspagetti
/datum/recipe/boiledrice
reagents = list("water" = 5, "rice" = 10)
reagents = list(REAGENT_ID_WATER = 5, "rice" = 10)
result = /obj/item/reagent_containers/food/snacks/boiledrice
/datum/recipe/ricepudding
@@ -317,12 +317,12 @@ I said no!
/datum/recipe/pastatomato
fruit = list("tomato" = 2)
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(/obj/item/reagent_containers/food/snacks/spagetti)
result = /obj/item/reagent_containers/food/snacks/pastatomato
/datum/recipe/meatballspagetti
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
/obj/item/reagent_containers/food/snacks/meatball,
@@ -331,7 +331,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/meatballspagetti
/datum/recipe/spesslaw
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
/obj/item/reagent_containers/food/snacks/meatball,
@@ -343,12 +343,12 @@ I said no!
/datum/recipe/candiedapple
fruit = list("apple" = 1)
reagents = list("water" = 5, "sugar" = 5) //Makes sense seeing as how it's just syrup on the exterior
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SUGAR = 5) //Makes sense seeing as how it's just syrup on the exterior
result = /obj/item/reagent_containers/food/snacks/candiedapple
/datum/recipe/caramelapple
fruit = list("apple" = 1)
reagents = list("milk" = 5, "sugar" = 5) //Since caramel can be made with milk I thought this was appropriate
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) //Since caramel can be made with milk I thought this was appropriate
result = /obj/item/reagent_containers/food/snacks/caramelapple
/datum/recipe/twobread
@@ -376,16 +376,16 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
/datum/recipe/bloodsoup
reagents = list("blood" = 30)
reagents = list(REAGENT_ID_BLOOD = 30)
result = /obj/item/reagent_containers/food/snacks/bloodsoup
/datum/recipe/slimesoup
reagents = list("water" = 10, "slimejelly" = 5)
reagents = list(REAGENT_ID_WATER = 10, "slimejelly" = 5)
items = list()
result = /obj/item/reagent_containers/food/snacks/slimesoup
/datum/recipe/boiledslimeextract
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/slime_extract,
)
@@ -415,7 +415,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/kudzudonburi
/datum/recipe/mysterysoup
reagents = list("water" = 10, "egg" = 3)
reagents = list(REAGENT_ID_WATER = 10, "egg" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/badrecipe,
/obj/item/reagent_containers/food/snacks/tofu,
@@ -426,24 +426,24 @@ I said no!
/datum/recipe/plumphelmetbiscuit
fruit = list("plumphelmet" = 1)
reagents = list("water" = 5, "flour" = 5)
reagents = list(REAGENT_ID_WATER = 5, "flour" = 5)
result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
result_quantity = 2
/datum/recipe/mushroomsoup
fruit = list("mushroom" = 1)
reagents = list("water" = 5, "milk" = 5)
reagents = list(REAGENT_ID_WATER = 5, "milk" = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/reagent_containers/food/snacks/mushroomsoup
/datum/recipe/chawanmushi
fruit = list("mushroom" = 1)
reagents = list("water" = 5, "soysauce" = 5, "egg" = 6)
reagents = list(REAGENT_ID_WATER = 5, "soysauce" = 5, "egg" = 6)
result = /obj/item/reagent_containers/food/snacks/chawanmushi
/datum/recipe/beetsoup
fruit = list("whitebeet" = 1, "cabbage" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/beetsoup
/datum/recipe/tossedsalad
@@ -487,7 +487,7 @@ I said no!
being_cooked.reagents.del_reagent("toxin")
/datum/recipe/stuffing
reagents = list("water" = 5, "sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/bread,
)
@@ -510,7 +510,7 @@ I said no!
/datum/recipe/onionsoup
fruit = list("onion" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
result = /obj/item/reagent_containers/food/snacks/soup/onion
/datum/recipe/microwavebun
@@ -539,7 +539,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/cutlet
/datum/recipe/roastedcornsunflowerseeds
reagents = list("sodiumchloride" = 1, "cornoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "cornoil" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -547,7 +547,7 @@ I said no!
result_quantity = 2
/datum/recipe/roastedsunflowerseeds
reagents = list("sodiumchloride" = 1, "cookingoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "cookingoil" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -555,7 +555,7 @@ I said no!
result_quantity = 2
/datum/recipe/roastedpeanutsunflowerseeds
reagents = list("sodiumchloride" = 1, "peanutoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "peanutoil" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawsunflower
)
@@ -564,24 +564,24 @@ I said no!
/datum/recipe/roastedpeanuts
fruit = list("peanut" = 2)
reagents = list("sodiumchloride" = 2, "cookingoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cookingoil" = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/roastedpeanutscorn
fruit = list("peanut" = 2)
reagents = list("sodiumchloride" = 2, "cornoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cornoil" = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/roastedpeanutspeanut
fruit = list("peanut" = 2)
reagents = list("sodiumchloride" = 2, "peanutoil" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "peanutoil" = 1)
result = /obj/item/reagent_containers/food/snacks/roastedpeanuts
result_quantity = 2
/datum/recipe/mint
reagents = list("sugar" = 5, "frostoil" = 5)
reagents = list(REAGENT_ID_SUGAR = 5, "frostoil" = 5)
result = /obj/item/reagent_containers/food/snacks/mint
/datum/recipe/sashimi
@@ -608,12 +608,12 @@ I said no!
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
reagents = list("sugar" = 5, "egg" = 3)
reagents = list(REAGENT_ID_SUGAR = 5, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/sugarcookie
result_quantity = 4
/datum/recipe/berrymuffin
reagents = list("milk" = 5, "sugar" = 5)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -622,7 +622,7 @@ I said no!
result_quantity = 2
/datum/recipe/poisonberrymuffin
reagents = list("milk" = 5, "sugar" = 5)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -631,7 +631,7 @@ I said no!
result_quantity = 2
/datum/recipe/ghostmuffin
reagents = list("milk" = 5, "sugar" = 5)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/ectoplasm
@@ -641,7 +641,7 @@ I said no!
result_quantity = 2
/datum/recipe/poisonghostmuffin
reagents = list("milk" = 5, "sugar" = 5)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/ectoplasm
@@ -663,11 +663,11 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/fruitsalad
/datum/recipe/eggbowl
reagents = list("water" = 5, "rice" = 10, "egg" = 3)
reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "egg" = 3)
result = /obj/item/reagent_containers/food/snacks/eggbowl
/datum/recipe/porkbowl
reagents = list("water" = 5, "rice" = 10)
reagents = list(REAGENT_ID_WATER = 5, "rice" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/cutlet
)
@@ -694,14 +694,14 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/piginblanket
/datum/recipe/bagelplain
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun
)
result = /obj/item/reagent_containers/food/snacks/bagelplain
/datum/recipe/bagelsunflower
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/reagent_containers/food/snacks/rawsunflower
@@ -709,7 +709,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bagelsunflower
/datum/recipe/bagelcheese
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/reagent_containers/food/snacks/cheesewedge
@@ -717,7 +717,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bagelcheese
/datum/recipe/bagelraisin
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/reagent_containers/food/snacks/no_raisin
@@ -726,14 +726,14 @@ I said no!
/datum/recipe/bagelpoppy
fruit = list("poppy" = 1)
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun
)
result = /obj/item/reagent_containers/food/snacks/bagelpoppy
/datum/recipe/bageleverything
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/fuel_assembly/supermatter
@@ -741,7 +741,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bageleverything
/datum/recipe/bageltwo
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/soulstone
@@ -786,7 +786,7 @@ I said no!
/datum/recipe/bearstew
fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
items = list(/obj/item/reagent_containers/food/snacks/bearmeat)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/bearstew
@@ -802,13 +802,13 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/bibimbap
/datum/recipe/friedrice
reagents = list("water" = 5, "rice" = 10, "soysauce" = 5)
reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "soysauce" = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/friedrice
/datum/recipe/lomein
reagents = list("water" = 5, "soysauce" = 5)
reagents = list(REAGENT_ID_WATER = 5, "soysauce" = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti
@@ -818,7 +818,7 @@ I said no!
/datum/recipe/chickennoodlesoup
fruit = list("carrot" = 1)
reagents = list("water" = 10)
reagents = list(REAGENT_ID_WATER = 10)
items = list( /obj/item/reagent_containers/food/snacks/spagetti, /obj/item/reagent_containers/food/snacks/rawcutlet)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/chickennoodlesoup
@@ -839,7 +839,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/risotto
/datum/recipe/poachedegg
reagents = list("spacespice" = 1, "sodiumchloride" = 1, "blackpepper" = 1, "water" = 5)
reagents = list("spacespice" = 1, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg
)
@@ -857,7 +857,7 @@ I said no!
// Chip update
/datum/recipe/microwavetortilla
reagents = list("flour" = 5, "water" = 5)
reagents = list("flour" = 5, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
@@ -874,7 +874,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/taco
/datum/recipe/chips
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tortilla
)
@@ -889,13 +889,13 @@ I said no!
/datum/recipe/salsa
fruit = list("chili" = 1, "tomato" = 1, "lime" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
result = /obj/item/reagent_containers/food/snacks/dip/salsa
reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together.
/datum/recipe/guac
fruit = list("chili" = 1, "lime" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tofu
)
@@ -904,7 +904,7 @@ I said no!
/datum/recipe/cheesesauce
fruit = list("chili" = 1, "tomato" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1)
reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/cheesewedge
)
@@ -1037,7 +1037,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
)
reagents = list("blood" = 15)
reagents = list(REAGENT_ID_BLOOD = 15)
result = /obj/item/reagent_containers/food/snacks/riztizkzi_sea
/datum/recipe/father_breakfast
@@ -1116,7 +1116,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/gigapuddi
/datum/recipe/gigapuddi/happy
reagents = list("milk" = 15, "sugar" = 5)
reagents = list("milk" = 15, REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
@@ -1124,7 +1124,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/gigapuddi/happy
/datum/recipe/gigapuddi/anger
reagents = list("milk" = 15, "sodiumchloride" = 5)
reagents = list("milk" = 15, REAGENT_ID_SODIUMCHLORIDE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg
+10 -10
View File
@@ -30,7 +30,7 @@
/datum/recipe/donerkebab
fruit = list("tomato" = 1, "cabbage" = 1)
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/meatsteak,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -46,7 +46,7 @@
result = /obj/item/reagent_containers/food/snacks/roastbeef
/datum/recipe/reishicup
reagents = list("psilocybin" = 3, "sugar" = 3)
reagents = list(REAGENT_ID_PSILOCYBIN = 3, REAGENT_ID_SUGAR = 3)
items = list(
/obj/item/reagent_containers/food/snacks/chocolatebar
)
@@ -54,7 +54,7 @@
/datum/recipe/hotandsoursoup
fruit = list("cabbage" = 1, "mushroom" = 1)
reagents = list("sodiumchloride" = 2, "blackpepper" = 2, "water" = 10)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "blackpepper" = 2, REAGENT_ID_WATER = 10)
items = list(
/obj/item/reagent_containers/food/snacks/tofu
)
@@ -69,7 +69,7 @@
result = /obj/item/reagent_containers/food/snacks/kitsuneudon
/datum/recipe/pillbugball
reagents = list("carbon" = 5)
reagents = list(REAGENT_ID_CARBON = 5)
items = list(
/obj/item/reagent_containers/food/snacks/meat/grubmeat
)
@@ -77,7 +77,7 @@
/datum/recipe/mammi
fruit = list("orange" = 1)
reagents = list("water" = 10, "flour" = 10, "milk" = 5, "sodiumchloride" = 1)
reagents = list(REAGENT_ID_WATER = 10, "flour" = 10, "milk" = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
result = /obj/item/reagent_containers/food/snacks/mammi
/datum/recipe/makaroni
@@ -121,14 +121,14 @@
result = /obj/item/reagent_containers/food/snacks/monkfishcooked
/datum/recipe/sharksteak
reagents = list("blackpepper"= 1, "sodiumchloride" = 1)
reagents = list("blackpepper"= 1, REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
)
result = /obj/item/reagent_containers/food/snacks/sharkmeatcooked
/datum/recipe/sharkdip
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
fruit = list("chili" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
@@ -136,7 +136,7 @@
result = /obj/item/reagent_containers/food/snacks/sharkmeatdip
/datum/recipe/sharkcubes
reagents = list("soysauce" = 5, "sodiumchloride" = 1)
reagents = list("soysauce" = 5, REAGENT_ID_SODIUMCHLORIDE = 1)
fruit = list("potato" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
@@ -146,7 +146,7 @@
//// food cubes
/datum/recipe/foodcubes
reagents = list("enzyme" = 20, "virusfood" = 5, "nutriment" = 15, "protein" = 15) // labor intensive
reagents = list("enzyme" = 20, "virusfood" = 5, REAGENT_ID_NUTRIMENT = 15, "protein" = 15) // labor intensive
items = list()
result = /obj/item/storage/box/wings/tray
@@ -182,7 +182,7 @@
result = /obj/item/reagent_containers/food/snacks/grub_purple
/datum/recipe/honey_candy
reagents = list("sugar" = 5, "nutriment" = 5)
reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_NUTRIMENT = 5)
items = list()
result = /obj/item/reagent_containers/food/snacks/honey_candy
+32 -32
View File
@@ -11,7 +11,7 @@
/datum/recipe/dionaroast
appliance = OVEN
fruit = list("apple" = 1)
reagents = list("pacid" = 5) //It dissolves the carapace. Still poisonous, though.
reagents = list(REAGENT_ID_PACID = 5) //It dissolves the carapace. Still poisonous, though.
items = list(/obj/item/holder/diona)
result = /obj/item/reagent_containers/food/snacks/dionaroast
reagent_mix = RECIPE_REAGENT_REPLACE //No eating polyacid
@@ -19,7 +19,7 @@
/datum/recipe/monkeysdelight
appliance = OVEN
fruit = list("banana" = 1)
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "flour" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/monkeycube
)
@@ -36,7 +36,7 @@
/* OLD RECIPE
/datum/recipe/turkey
appliance = OVEN
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/stuffing
@@ -47,7 +47,7 @@
/datum/recipe/turkey
appliance = OVEN
fruit = list("potato" = 1)
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/rawturkey,
/obj/item/reagent_containers/food/snacks/stuffing
@@ -56,7 +56,7 @@
/datum/recipe/tofurkey
appliance = OVEN
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tofu,
/obj/item/reagent_containers/food/snacks/tofu,
@@ -67,7 +67,7 @@
/datum/recipe/zestfish
appliance = OVEN
fruit = list("lemon" = 1)
reagents = list("sodiumchloride" = 3)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat
)
@@ -76,7 +76,7 @@
/datum/recipe/limezestfish
appliance = OVEN
fruit = list("lime" = 1)
reagents = list("sodiumchloride" = 3)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3)
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat
)
@@ -91,12 +91,12 @@
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
)
reagents = list("sodiumchloride" = 1, "yeast" = 5)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "yeast" = 5)
result = /obj/item/reagent_containers/food/snacks/sliceable/bread
/datum/recipe/baguette
appliance = OVEN
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "yeast" = 5)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "yeast" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
@@ -182,7 +182,7 @@
/datum/recipe/bananabread
appliance = OVEN
fruit = list("banana" = 1)
reagents = list("milk" = 5, "sugar" = 15)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
@@ -228,14 +228,14 @@
/datum/recipe/pie
appliance = OVEN
fruit = list("banana" = 1)
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/pie
/datum/recipe/cherrypie
appliance = OVEN
fruit = list("cherries" = 1)
reagents = list("sugar" = 10)
reagents = list(REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
@@ -262,14 +262,14 @@
/datum/recipe/pumpkinpie
appliance = OVEN
fruit = list("pumpkin" = 1)
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
/datum/recipe/appletart
appliance = OVEN
fruit = list("goldapple" = 1)
reagents = list("sugar" = 10)
reagents = list(REAGENT_ID_SUGAR = 10)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/reagent_containers/food/snacks/appletart
result_quantity = 2
@@ -278,7 +278,7 @@
/datum/recipe/keylimepie
appliance = OVEN
fruit = list("lime" = 2)
reagents = list("milk" = 5, "sugar" = 5, "egg" = 3, "flour" = 10)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3, "flour" = 10)
result = /obj/item/reagent_containers/food/snacks/sliceable/keylimepie
reagent_mix = RECIPE_REAGENT_REPLACE //No raw egg in finished product, protein after cooking causes magic meatballs otherwise
@@ -294,7 +294,7 @@
/datum/recipe/cookie
appliance = OVEN
reagents = list("milk" = 10, "sugar" = 10)
reagents = list("milk" = 10, REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/chocolatebar
@@ -305,7 +305,7 @@
/datum/recipe/ovenfortunecookie
appliance = OVEN
reagents = list("sugar" = 5)
reagents = list(REAGENT_ID_SUGAR = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/paper
@@ -321,7 +321,7 @@
/datum/recipe/cracker
appliance = OVEN
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -348,7 +348,7 @@
/datum/recipe/cinnamonbun
appliance = OVEN
reagents = list("sugar" = 15, "cream" = 10)
reagents = list(REAGENT_ID_SUGAR = 15, "cream" = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
@@ -515,7 +515,7 @@
/datum/recipe/pancakes
appliance = OVEN
reagents = list("milk" = 5, "sugar" = 15)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -526,7 +526,7 @@
/datum/recipe/pancakes/berry
appliance = OVEN
fruit = list("berries" = 2)
reagents = list("milk" = 5, "sugar" = 15)
reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -595,7 +595,7 @@
/datum/recipe/truffle
appliance = OVEN
reagents = list("sugar" = 5, "cream" = 5)
reagents = list(REAGENT_ID_SUGAR = 5, "cream" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/chocolatebar
)
@@ -605,7 +605,7 @@
/datum/recipe/croissant
appliance = OVEN
reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5, "yeast" = 5)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_WATER = 5, "milk" = 5, "yeast" = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(/obj/item/reagent_containers/food/snacks/dough)
result = /obj/item/reagent_containers/food/snacks/croissant
@@ -623,7 +623,7 @@
/datum/recipe/suppermatter
appliance = OVEN
reagents = list("radium" = 5, "milk" = 5)
reagents = list(REAGENT_ID_RADIUM = 5, "milk" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake
)
@@ -632,7 +632,7 @@
/datum/recipe/excitingsuppermatter
appliance = OVEN
reagents = list("radium" = 5, "spacespice" = 5)
reagents = list(REAGENT_ID_RADIUM = 5, "spacespice" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake
)
@@ -641,7 +641,7 @@
/datum/recipe/waffles
appliance = OVEN
reagents = list("sugar" = 10)
reagents = list(REAGENT_ID_SUGAR = 10)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
@@ -658,7 +658,7 @@
/datum/recipe/meatbun
appliance = OVEN
fruit = list("cabbage" = 1)
reagents = list("water" = 5)
reagents = list(REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
@@ -669,7 +669,7 @@
/datum/recipe/spicedmeatbun
appliance = OVEN
reagents = list("spacespice" = 2, "water" = 5)
reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/reagent_containers/food/snacks/rawcutlet
@@ -680,7 +680,7 @@
/datum/recipe/custardbun
appliance = OVEN
reagents = list("spacespice" = 1, "water" = 5, "egg" = 3)
reagents = list("spacespice" = 1, REAGENT_ID_WATER = 5, "egg" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
@@ -689,7 +689,7 @@
/datum/recipe/chickenmomo
appliance = OVEN
reagents = list("spacespice" = 2, "water" = 5)
reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/reagent_containers/food/snacks/doughslice,
@@ -702,7 +702,7 @@
/datum/recipe/veggiemomo
appliance = OVEN
reagents = list("spacespice" = 2, "water" = 5)
reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/doughslice,
@@ -711,4 +711,4 @@
)
reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here
result = /obj/item/reagent_containers/food/snacks/veggiemomo
result_quantity = 2
result_quantity = 2
+2 -2
View File
@@ -1,7 +1,7 @@
/datum/recipe/scorpion
appliance = OVEN
reagents = list("sodiumchloride" = 1)
reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1)
items = list(
/obj/item/reagent_containers/food/snacks/scorpion
)
result = /obj/item/reagent_containers/food/snacks/scorpion_cooked
result = /obj/item/reagent_containers/food/snacks/scorpion_cooked
+2 -2
View File
@@ -233,7 +233,7 @@
/obj/item/watertank/op/Initialize()
. = ..()
reagents.add_reagent("fuel", 500)
reagents.add_reagent(REAGENT_ID_FUEL, 500)
reagents.add_reagent("cryptobiolin", 500)
reagents.add_reagent(REAGENT_ID_PHORON, 500)
reagents.add_reagent("condensedcapsaicin", 500)
@@ -266,7 +266,7 @@
/obj/item/watertank/atmos/Initialize()
. = ..()
reagents.add_reagent("water", 200)
reagents.add_reagent(REAGENT_ID_WATER, 200)
/obj/item/watertank/atmos/make_noz()
return new /obj/item/reagent_containers/spray/mister/atmos(src)
+6 -6
View File
@@ -52,7 +52,7 @@
var/list/data = list()
if(reagent_data.len > 1 && potency > 0)
rtotal += round(potency/reagent_data[2])
if(rid == "nutriment")
if(rid == REAGENT_ID_NUTRIMENT)
data[seed.seed_name] = max(1,rtotal)
reagents.add_reagent(rid,max(1,rtotal),data)
@@ -70,13 +70,13 @@
desc = SSplants.product_descs["[seed.uid]"]
else
var/list/descriptors = list()
if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
if(reagents.has_reagent(REAGENT_ID_SUGAR) || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
descriptors |= "sweet"
if(reagents.has_reagent("anti_toxin"))
descriptors |= "astringent"
if(reagents.has_reagent("frostoil"))
descriptors |= "numbing"
if(reagents.has_reagent("nutriment"))
if(reagents.has_reagent(REAGENT_ID_NUTRIMENT))
descriptors |= "nutritious"
if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin"))
descriptors |= "spicy"
@@ -84,11 +84,11 @@
descriptors |= "bitter"
if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice"))
descriptors |= "sweet-sour"
if(reagents.has_reagent("radium") || reagents.has_reagent("uranium"))
if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent("uranium"))
descriptors |= "radioactive"
if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin"))
descriptors |= "poisonous"
if(reagents.has_reagent("psilocybin") || reagents.has_reagent("bliss") || reagents.has_reagent("earthsblood"))
if(reagents.has_reagent(REAGENT_ID_PSILOCYBIN) || reagents.has_reagent(REAGENT_ID_BLISS) || reagents.has_reagent("earthsblood"))
descriptors |= "hallucinogenic"
if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood"))
descriptors |= "medicinal"
@@ -96,7 +96,7 @@
descriptors |= "shiny"
if(reagents.has_reagent("lube"))
descriptors |= "slippery"
if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid"))
if(reagents.has_reagent(REAGENT_ID_PACID) || reagents.has_reagent(REAGENT_ID_SACID))
descriptors |= "acidic"
if(seed.get_trait(TRAIT_JUICY))
descriptors |= "juicy"
+6 -6
View File
@@ -390,7 +390,7 @@
"calvatia", "gigantea", "clitopilis", "prumulus", "entoloma", "abortivum",
"suillus", "tuber", "aestivum", "volvacea", "delica", "russula", "rozites")
possible_prefixes |= list("butter", "shad", "sugar", "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown",
possible_prefixes |= list("butter", "shad", REAGENT_ID_SUGAR, "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown",
"black", "white", "paper", "slippery", "honey", "bitter")
prefix = pick(possible_prefixes)
@@ -455,7 +455,7 @@
chems = list()
if(prob(80))
chems["nutriment"] = list(rand(1,10),rand(10,20))
chems[REAGENT_ID_NUTRIMENT] = list(rand(1,10),rand(10,20))
var/additional_chems = rand(0,5)
@@ -463,10 +463,10 @@
// VOREStation Edit Start: Modified exclusion list
var/list/banned_chems = list(
"adminordrazine",
"nutriment",
"macrocillin",
"microcillin",
"normalcillin",
REAGENT_ID_NUTRIMENT,
REAGENT_ID_MACROCILLIN,
REAGENT_ID_MICROCILLIN,
REAGENT_ID_NORMALCILLIN,
"magicdust"
)
// VOREStation Edit End: Modified exclusion list
+3 -3
View File
@@ -7,7 +7,7 @@
display_name = "Shrinking mushroom trees"
mutants = list("megam")
kitchen_tag = "microm"
chems = list("microcillin" = list(1,20))
chems = list(REAGENT_ID_MICROCILLIN = list(1,20))
/datum/seed/size/New()
..()
@@ -27,7 +27,7 @@
display_name = "Mega mushroom trees"
mutants = list("microm")
kitchen_tag = "megam"
chems = list("macrocillin" = list(1,20))
chems = list(REAGENT_ID_MACROCILLIN = list(1,20))
/datum/seed/size/megam/New()
..()
@@ -41,4 +41,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#DADA00")
/datum/seed/gnomes
harvest_sound = 'sound/items/hooh.ogg'
harvest_sound = 'sound/items/hooh.ogg'
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "amauri"
display_name = "amauri plant"
kitchen_tag = "amauri"
chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),"nutriment" = list(1,5))
chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/amauri/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,4)
set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_POTENCY,10)
@@ -5,7 +5,7 @@
display_name = "ambrosia vulgaris"
kitchen_tag = "ambrosia"
mutants = list("ambrosiadeus")
chems = list("nutriment" = list(1), "ambrosia_extract" = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1))
chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMBROSIAEXTRACT = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1))
/datum/seed/ambrosia/New()
..()
@@ -25,7 +25,7 @@
display_name = "ambrosia deus"
kitchen_tag = "ambrosiadeus"
mutants = list("ambrosiainfernus", "ambrosiagaia")
chems = list("nutriment" = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), "ambrosia_extract" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/deus/New()
..()
@@ -38,7 +38,7 @@
display_name = "ambrosia infernus"
kitchen_tag = "ambrosiainfernus"
mutants = null
chems = list("nutriment" = list(1,3), "oxycodone" = list(1,8), "impedrezene" = list(1,10), "mindbreaker" = list(1,10), "ambrosia_extract" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "oxycodone" = list(1,8), "impedrezene" = list(1,10), "mindbreaker" = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/infernus/New()
..()
@@ -51,7 +51,7 @@
display_name = "ambrosia gaia"
kitchen_tag = "ambrosiagaia"
mutants = null
chems = list ("earthsblood" = list(3,5), "nutriment" = list(1,3))
chems = list ("earthsblood" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,3))
/datum/seed/ambrosia/gaia/New()
..()
@@ -65,4 +65,4 @@
set_trait(TRAIT_BIOLUM,1)
set_trait(TRAIT_BIOLUM_COLOUR,"#ffb500")
set_trait(TRAIT_PRODUCT_COLOUR, "#ffee00")
set_trait(TRAIT_PLANT_COLOUR,"#f3ba2b")
set_trait(TRAIT_PLANT_COLOUR,"#f3ba2b")
+4 -4
View File
@@ -5,7 +5,7 @@
display_name = "apple tree"
kitchen_tag = "apple"
mutants = list("poisonapple","goldapple")
chems = list("nutriment" = list(1,10),"applejuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10),"applejuice" = list(10,20))
/datum/seed/apple/New()
..()
@@ -31,7 +31,7 @@
display_name = "gold apple tree"
kitchen_tag = "goldapple"
mutants = null
chems = list("nutriment" = list(1,10), "gold" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "gold" = list(1,5))
/datum/seed/apple/gold/New()
..()
@@ -46,7 +46,7 @@
seed_name = "sivian pod"
display_name = "sivian pod"
kitchen_tag = "apple"
chems = list("nutriment" = list(1,5),"sifsap" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5),"sifsap" = list(10,20))
/datum/seed/apple/sif/New()
..()
@@ -59,4 +59,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#0720c3")
set_trait(TRAIT_PLANT_ICON,"tree5")
set_trait(TRAIT_FLESH_COLOUR,"#05157d")
set_trait(TRAIT_IDEAL_LIGHT, 1)
set_trait(TRAIT_IDEAL_LIGHT, 1)
@@ -5,7 +5,7 @@
display_name = "berry bush"
kitchen_tag = "berries"
mutants = list("glowberries","poisonberries")
chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "berryjuice" = list(10,10))
/datum/seed/berry/New()
..()
@@ -26,7 +26,7 @@
seed_name = "glowberry"
display_name = "glowberry bush"
mutants = null
chems = list("nutriment" = list(1,10), "uranium" = list(3,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "uranium" = list(3,5))
/datum/seed/berry/glow/New()
..()
@@ -47,7 +47,7 @@
kitchen_tag = "poisonberries"
display_name = "poison berry bush"
mutants = list("deathberries")
chems = list("nutriment" = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5))
/datum/seed/berry/poison/New()
..()
@@ -60,7 +60,7 @@
seed_name = "death berry"
display_name = "death berry bush"
mutants = null
chems = list("nutriment" = list(1), "toxin" = list(3,3), "lexorin" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,3), "lexorin" = list(1,5))
/datum/seed/berry/poison/death/New()
..()
@@ -79,4 +79,4 @@
/datum/seed/berry/peppercorn/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"#303030")
set_trait(TRAIT_WATER_CONSUMPTION, 2)
set_trait(TRAIT_WATER_CONSUMPTION, 2)
@@ -3,7 +3,7 @@
seed_name = "cabbage"
display_name = "cabbages"
kitchen_tag = "cabbage"
chems = list("nutriment" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/cabbage/New()
..()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_ICON,"vine2")
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
@@ -3,7 +3,7 @@
seed_name = "carrot"
display_name = "carrots"
kitchen_tag = "carrot"
chems = list("nutriment" = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
/datum/seed/carrots/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_PRODUCT_ICON,"carrot")
set_trait(TRAIT_PRODUCT_COLOUR,"#FFDB4A")
set_trait(TRAIT_PLANT_ICON,"carrot")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "celery"
display_name = "celery"
kitchen_tag = "celery"
chems = list("nutriment" = list(5,20))
chems = list(REAGENT_ID_NUTRIMENT = list(5,20))
/datum/seed/celery/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_POTENCY,8)
set_trait(TRAIT_PRODUCT_ICON,"stalk")
set_trait(TRAIT_PRODUCT_COLOUR,"#56FD56")
set_trait(TRAIT_PLANT_ICON,"stalk3")
set_trait(TRAIT_PLANT_ICON,"stalk3")
@@ -4,7 +4,7 @@
seed_noun = "pits"
display_name = "cherry tree"
kitchen_tag = "cherries"
chems = list("nutriment" = list(1,15), "sugar" = list(1,15), "cherryjelly" = list(10,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_SUGAR = list(1,15), "cherryjelly" = list(10,15))
/datum/seed/cherries/New()
..()
@@ -17,4 +17,4 @@
set_trait(TRAIT_PRODUCT_ICON,"cherry")
set_trait(TRAIT_PRODUCT_COLOUR,"#A80000")
set_trait(TRAIT_PLANT_ICON,"tree2")
set_trait(TRAIT_PLANT_COLOUR,"#2F7D2D")
set_trait(TRAIT_PLANT_COLOUR,"#2F7D2D")
+5 -5
View File
@@ -4,7 +4,7 @@
seed_name = "chili"
display_name = "chili plants"
kitchen_tag = "chili"
chems = list("capsaicin" = list(3,5), "nutriment" = list(1,25))
chems = list("capsaicin" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,25))
mutants = list("icechili", "ghostchili")
/datum/seed/chili/New()
@@ -26,7 +26,7 @@
display_name = "ice-pepper plants"
kitchen_tag = "icechili"
mutants = null
chems = list("frostoil" = list(3,5), "nutriment" = list(1,50))
chems = list("frostoil" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,50))
/datum/seed/chili/ice/New()
..()
@@ -40,10 +40,10 @@
display_name = "ghost chili plants"
kitchen_tag = "ghostchili"
mutants = null
chems = list("condensedcapsaicin" = list (3,10), "nutriment" = list (1,25))
chems = list("condensedcapsaicin" = list (3,10), REAGENT_ID_NUTRIMENT = list (1,25))
/datum/seed/chili/ghost/New()
..()
set_trait(TRAIT_MATURATION,6)
set_trait(TRAIT_PRODUCTION,3)
set_trait(TRAIT_PRODUCT_COLOUR,"#eaecec")
set_trait(TRAIT_PRODUCT_COLOUR,"#eaecec")
+4 -4
View File
@@ -3,7 +3,7 @@
seed_name = "lime"
display_name = "lime trees"
kitchen_tag = "lime"
chems = list("nutriment" = list(1,20), "limejuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20))
/datum/seed/citrus/New()
..()
@@ -23,7 +23,7 @@
seed_name = "lemon"
display_name = "lemon trees"
kitchen_tag = "lemon"
chems = list("nutriment" = list(1,20), "lemonjuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20))
/datum/seed/citrus/lemon/New()
..()
@@ -38,9 +38,9 @@
seed_name = "orange"
display_name = "orange trees"
kitchen_tag = "orange"
chems = list("nutriment" = list(1,20), "orangejuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20))
/datum/seed/citrus/orange/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"#FFC20A")
set_trait(TRAIT_FLESH_COLOUR,"#FFC20A")
set_trait(TRAIT_FLESH_COLOUR,"#FFC20A")
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "cacao"
display_name = "cacao tree"
kitchen_tag = "cocoa"
chems = list("nutriment" = list(1,10), "coco" = list(4,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "coco" = list(4,5))
/datum/seed/cocoa/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#CCA935")
set_trait(TRAIT_PLANT_ICON,"tree2")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "corn"
display_name = "ears of corn"
kitchen_tag = "corn"
chems = list("nutriment" = list(1,10), "cornoil" = list(3,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "cornoil" = list(3,15))
trash_type = /obj/item/corncob
/datum/seed/corn/New()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_ICON,"corn")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
+2 -2
View File
@@ -4,7 +4,7 @@
seed_noun = "pits"
display_name = "durian"
kitchen_tag = "durian"
chems = list("nutriment" = list(1,5), "durianpaste" = list(1, 20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "durianpaste" = list(1, 20))
/datum/seed/durian/New()
..()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#87C969")
set_trait(TRAIT_PLANT_ICON,"tree")
set_trait(TRAIT_IDEAL_LIGHT, 8)
set_trait(TRAIT_WATER_CONSUMPTION, 8)
set_trait(TRAIT_WATER_CONSUMPTION, 8)
@@ -5,7 +5,7 @@
display_name = "eggplants"
kitchen_tag = "eggplant"
mutants = list("egg-plant")
chems = list("nutriment" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/eggplant/New()
..()
@@ -27,5 +27,5 @@
display_name = "egg-plants"
kitchen_tag = "egg-plant"
mutants = null
chems = list("nutriment" = list(1,5), "egg" = list(3,12))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "egg" = list(3,12))
has_item_product = /obj/item/reagent_containers/food/snacks/egg/purple
@@ -4,7 +4,7 @@
seed_name = "harebell"
display_name = "harebells"
kitchen_tag = "harebell"
chems = list("nutriment" = list(1,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20))
/datum/seed/flower/New()
..()
@@ -22,7 +22,7 @@
seed_name = "poppy"
display_name = "poppies"
kitchen_tag = "poppy"
chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
/datum/seed/flower/poppy/New()
..()
@@ -58,7 +58,7 @@
seed_name = "lavender"
display_name = "lavender"
kitchen_tag = "lavender"
chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
/datum/seed/flower/lavender/New()
..()
@@ -79,7 +79,7 @@
display_name = "rose"
kitchen_tag = "rose"
mutants = list("bloodrose")
chems = list("nutriment" = list(1,5), "stoxin" = list(0,2))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(0,2))
/datum/seed/flower/rose/New()
..()
@@ -99,7 +99,7 @@
name = "bloodrose"
display_name = "bleeding rose"
mutants = null
chems = list("nutriment" = list(1,5), "stoxin" = list(1,5), "blood" = list(0,2))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(1,5), REAGENT_ID_BLOOD = list(0,2))
/datum/seed/flower/rose/blood/New()
..()

Some files were not shown because too many files have changed in this diff Show More