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

[MIRROR] Reagent unit testing (#10166)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-14 21:47:07 -07:00
committed by GitHub
parent 579ce17c82
commit 515df0c7ac
35 changed files with 259 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/machinery/dispenser/cartridge_presets.dm
View File

@@ -72,7 +72,7 @@
/obj/item/reagent_containers/chem_disp_cartridge/rum
spawn_reagent = REAGENT_ID_RUM
/obj/item/reagent_containers/chem_disp_cartridge/tequila
spawn_reagent = REAGENT_ID_TEQUILLA
spawn_reagent = REAGENT_ID_TEQUILA
/obj/item/reagent_containers/chem_disp_cartridge/vermouth
spawn_reagent = REAGENT_ID_VERMOUTH
/obj/item/reagent_containers/chem_disp_cartridge/cognac

2
code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
View File

@@ -53,7 +53,7 @@
/obj/machinery/chemical_dispenser/bar_alc
dispense_reagents = list(
REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_SODAWATER, REAGENT_ID_TONIC, REAGENT_ID_BEER, REAGENT_ID_KAHLUA,
REAGENT_ID_WHISKEY, REAGENT_ID_REDWINE, REAGENT_ID_WHITEWINE, REAGENT_ID_VODKA, REAGENT_ID_CIDER, REAGENT_ID_GIN, REAGENT_ID_RUM, REAGENT_ID_TEQUILLA, REAGENT_ID_VERMOUTH, REAGENT_ID_COGNAC, REAGENT_ID_ALE, REAGENT_ID_MEAD, REAGENT_ID_BITTERS
REAGENT_ID_WHISKEY, REAGENT_ID_REDWINE, REAGENT_ID_WHITEWINE, REAGENT_ID_VODKA, REAGENT_ID_CIDER, REAGENT_ID_GIN, REAGENT_ID_RUM, REAGENT_ID_TEQUILA, REAGENT_ID_VERMOUTH, REAGENT_ID_COGNAC, REAGENT_ID_ALE, REAGENT_ID_MEAD, REAGENT_ID_BITTERS
)
/obj/machinery/chemical_dispenser/bar_coffee

2
code/modules/reagents/reactions/distilling/distilling.dm
View File

@@ -1,5 +1,5 @@
/decl/chemical_reaction/distilling
// name = null
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
// id = null
// result = null
// required_reagents = list()

31
code/modules/reagents/reactions/instant/drinks.dm
View File

@@ -1,3 +1,6 @@
/decl/chemical_reaction/instant/drinks
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
/decl/chemical_reaction/instant/drinks/coffee
name = REAGENT_COFFEE
id = REAGENT_ID_COFFEE
@@ -58,7 +61,7 @@
name = REAGENT_PATRON
id = REAGENT_ID_PATRON
result = REAGENT_ID_PATRON
required_reagents = list(REAGENT_ID_TEQUILLA = 10, REAGENT_ID_SILVER = 1)
required_reagents = list(REAGENT_ID_TEQUILA = 10, REAGENT_ID_SILVER = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/bilk
@@ -337,14 +340,14 @@
name = REAGENT_BRAVEBULL
id = REAGENT_ID_BRAVEBULL
result = REAGENT_ID_BRAVEBULL
required_reagents = list(REAGENT_ID_TEQUILLA = 2, REAGENT_ID_KAHLUA = 1)
required_reagents = list(REAGENT_ID_TEQUILA = 2, REAGENT_ID_KAHLUA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/tequilla_sunrise
/decl/chemical_reaction/instant/drinks/tequila_sunrise
name = "Tequilla Sunrise"
id = REAGENT_ID_TEQUILLASUNRISE
result = REAGENT_ID_TEQUILLASUNRISE
required_reagents = list(REAGENT_ID_TEQUILLA = 2, REAGENT_ID_ORANGEJUICE = 1)
id = REAGENT_ID_TEQUILASUNRISE
result = REAGENT_ID_TEQUILASUNRISE
required_reagents = list(REAGENT_ID_TEQUILA = 2, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/phoron_special
@@ -414,14 +417,14 @@
name = REAGENT_MARGARITA
id = REAGENT_ID_MARGARITA
result = REAGENT_ID_MARGARITA
required_reagents = list(REAGENT_ID_TEQUILLA = 2, REAGENT_ID_LIMEJUICE = 1)
required_reagents = list(REAGENT_ID_TEQUILA = 2, REAGENT_ID_LIMEJUICE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/longislandicedtea
name = REAGENT_LONGISLANDICEDTEA
id = REAGENT_ID_LONGISLANDICEDTEA
result = REAGENT_ID_LONGISLANDICEDTEA
required_reagents = list(REAGENT_ID_VODKA = 1, REAGENT_ID_GIN = 1, REAGENT_ID_TEQUILLA = 1, REAGENT_ID_RUMANDCOLA = 3)
required_reagents = list(REAGENT_ID_VODKA = 1, REAGENT_ID_GIN = 1, REAGENT_ID_TEQUILA = 1, REAGENT_ID_RUMANDCOLA = 3)
result_amount = 6
/decl/chemical_reaction/instant/drinks/threemileisland
@@ -600,7 +603,7 @@
required_reagents = list(REAGENT_ID_IRON = 1, REAGENT_ID_REDWINE = 5, REAGENT_ID_VODKA = 5)
result_amount = 10
/decl/chemical_reaction/instant/drinks/changelingsting
/decl/chemical_reaction/instant/drinks/changeling_sting
name = REAGENT_CHANGELINGSTING
id = REAGENT_ID_CHANGELINGSTING
result = REAGENT_ID_CHANGELINGSTING
@@ -957,7 +960,7 @@
name = REAGENT_EREBUSMOONRISE
id = REAGENT_ID_EREBUSMOONRISE
result = REAGENT_ID_EREBUSMOONRISE
required_reagents = list(REAGENT_ID_WHISKEY = 1, REAGENT_ID_VODKA = 1, REAGENT_ID_TEQUILLA = 1)
required_reagents = list(REAGENT_ID_WHISKEY = 1, REAGENT_ID_VODKA = 1, REAGENT_ID_TEQUILA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/balloon
@@ -1006,7 +1009,7 @@
name = REAGENT_BINMANBLISS
id = REAGENT_ID_BINMANBLISS
result = REAGENT_ID_BINMANBLISS
required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_TEQUILLA = 1)
required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_TEQUILA = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/chrysanthemum
@@ -1046,7 +1049,7 @@
catalysts = list(REAGENT_ID_ENZYME = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe
result_amount = 5
/decl/chemical_reaction/instant/drinks/lovepotion
/decl/chemical_reaction/instant/drinks/love_potion
name = REAGENT_LOVEPOTION
id = REAGENT_ID_LOVEPOTION
result = REAGENT_ID_LOVEPOTION
@@ -1204,7 +1207,7 @@
name = REAGENT_PALOMA
id = REAGENT_ID_PALOMA
result = REAGENT_ID_PALOMA
required_reagents = list(REAGENT_ID_SODAWATER = 1, REAGENT_ID_TEQUILLASUNRISE = 2)
required_reagents = list(REAGENT_ID_SODAWATER = 1, REAGENT_ID_TEQUILASUNRISE = 2)
result_amount = 3
/decl/chemical_reaction/instant/drinks/mojito
@@ -1214,7 +1217,7 @@
required_reagents = list(REAGENT_ID_RUM = 3, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_MINT = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/virginmojito
/decl/chemical_reaction/instant/drinks/virgin_mojito
name = REAGENT_VIRGINMOJITO
id = REAGENT_ID_VIRGINMOJITO
result = REAGENT_ID_VIRGINMOJITO

3
code/modules/reagents/reactions/instant/food.dm
View File

@@ -1,3 +1,6 @@
/decl/chemical_reaction/instant/food
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
/decl/chemical_reaction/instant/food/hot_ramen
name = REAGENT_HOTRAMEN
id = REAGENT_ID_HOTRAMEN

3
code/modules/reagents/reactions/instant/instant.dm
View File

@@ -3,6 +3,9 @@
/* Common reactions */
/decl/chemical_reaction/instant
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
/decl/chemical_reaction/instant/inaprovaline
name = REAGENT_INAPROVALINE
id = REAGENT_ID_INAPROVALINE

2
code/modules/reagents/reagent_containers/borghypo.dm
View File

@@ -177,7 +177,7 @@
REAGENT_ID_SPECIALWHISKEY,
REAGENT_ID_SUGAR,
REAGENT_ID_TEA,
REAGENT_ID_TEQUILLA,
REAGENT_ID_TEQUILA,
REAGENT_ID_TOMATOJUICE,
REAGENT_ID_TONIC,
REAGENT_ID_VERMOUTH,

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

@@ -2,9 +2,9 @@
/datum/reagent
var/name = "Reagent"
var/id = "reagent"
var/description = "A non-descript chemical."
var/name = REAGENT_DEVELOPER_WARNING
var/id = REAGENT_ID_DEVELOPER_WARNING
var/description = REAGENT_DESC_DEVELOPER_WARNING
var/taste_description = "bitterness"
var/taste_mult = 1 //how this taste compares to others. Higher values means it is more noticable
var/datum/reagents/holder = null

3
code/modules/reagents/reagents/core.dm
View File

@@ -2,6 +2,7 @@
data = new/list("donor" = null, "viruses" = null, "species" = SPECIES_HUMAN, "blood_DNA" = null, "blood_type" = null, "blood_colour" = "#A10808", "resistances" = null, "trace_chem" = null, REAGENT_ID_ANTIBODIES = list())
name = REAGENT_BLOOD
id = REAGENT_ID_BLOOD
description = "Blood."
taste_description = REAGENT_ID_IRON
taste_mult = 1.3
reagent_state = LIQUID
@@ -169,6 +170,7 @@
/datum/reagent/blood/synthblood
name = REAGENT_SYNTHBLOOD
description = "Synthetic Blood"
id = REAGENT_ID_SYNTHBLOOD
color = "#999966"
volume_mod = 2
@@ -191,6 +193,7 @@
/datum/reagent/antibodies
data = list(REAGENT_ID_ANTIBODIES=list())
name = REAGENT_ANTIBODIES
description = "Antibodies against some type of virus."
taste_description = "slime"
id = REAGENT_ID_ANTIBODIES
reagent_state = LIQUID

20
code/modules/reagents/reagents/food_drinks.dm
View File

@@ -2611,7 +2611,7 @@
glass_desc = "You can almost smell the tranquility emanating from this."
//allergen_type = ALLERGEN_FRUIT Sorry to break the news, chief. Honey is not a fruit.
/datum/reagent/drink/lovepotion
/datum/reagent/drink/love_potion
name = REAGENT_LOVEPOTION
id = REAGENT_ID_LOVEPOTION
description = "Creamy strawberries and sugar, simple and sweet."
@@ -2721,7 +2721,7 @@
if(D.water_based)
M.adjustToxLoss(removed * -2)
/datum/reagent/drink/mojito
/datum/reagent/drink/virgin_mojito
name = REAGENT_VIRGINMOJITO
id = REAGENT_ID_VIRGINMOJITO
description = "Mint, bubbly water, and citrus, made for sailing."
@@ -3132,6 +3132,7 @@
//Base type for alchoholic drinks containing coffee
/datum/reagent/ethanol/coffee
name = REAGENT_DEVELOPER_WARNING
overdose = 45
allergen_type = ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Contains coffee or is made from coffee
@@ -3242,8 +3243,8 @@
allergen_type = ALLERGEN_FRUIT //Made from orange juice
/datum/reagent/ethanol/tequila
name = REAGENT_TEQUILLA
id = REAGENT_ID_TEQUILLA
name = REAGENT_TEQUILA
id = REAGENT_ID_TEQUILA
description = "A strong and mildly flavored, Mexican produced spirit. Feeling thirsty hombre?"
taste_description = "paint thinner"
color = "#FFFF91"
@@ -3387,6 +3388,9 @@
else
L.take_damage(100, 0)
/datum/reagent/ethanol/wine
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
/datum/reagent/ethanol/wine/champagne
name = REAGENT_CHAMPAGNE
id = REAGENT_ID_CHAMPAGNE
@@ -3653,7 +3657,7 @@
glass_name = REAGENT_BRAVEBULL
glass_desc = "Tequilla and coffee liquor, brought together in a mouthwatering mixture. Drink up."
/datum/reagent/ethanol/changelingsting
/datum/reagent/ethanol/changeling_sting
name = REAGENT_CHANGELINGSTING
id = REAGENT_ID_CHANGELINGSTING
description = "You take a tiny sip and feel a burning sensation..."
@@ -4135,9 +4139,9 @@
allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from beer(grain) and whiskeycola(whiskey(grain) and cola(caffeine))
/datum/reagent/ethanol/tequilla_sunrise
name = REAGENT_TEQUILLASUNRISE
id = REAGENT_ID_TEQUILLASUNRISE
/datum/reagent/ethanol/tequila_sunrise
name = REAGENT_TEQUILASUNRISE
id = REAGENT_ID_TEQUILASUNRISE
description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~."
taste_description = "oranges"
color = "#FFE48C"

3
code/modules/reagents/reagents/food_drinks_vr.dm
View File

@@ -352,6 +352,9 @@
glass_name = REAGENT_SCSATW
glass_desc = "The best accessory to daydrinking."
/datum/reagent/drink
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
/datum/reagent/drink/choccymilk
name = REAGENT_CHOCCYMILK
id = REAGENT_ID_CHOCCYMILK

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

@@ -1,6 +1,7 @@
/datum/reagent/vaccine
name = REAGENT_VACCINE
id = REAGENT_ID_VACCINE
description = "Liquid vaccine against some type of virus."
color = "#C81040"
taste_description = "antibodies"
@@ -29,6 +30,9 @@
color = "#41B0C0"
taste_mult = 1.5
/datum/reagent/medicine
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
/datum/reagent/medicine/adranol/adranolvirusfood
name = REAGENT_ADRANOLVIRUSFOOD
id = REAGENT_ID_ADRANOLVIRUSFOOD