Skip to content

Commit

Permalink
Jars and Reagents (#2088)
Browse files Browse the repository at this point in the history
Converts honey jar into regular jar and adds 2 jar varients, random syrup and pudding.

Update glass.dm

Hotfix
  • Loading branch information
InsightfulParasite authored Apr 27, 2024
1 parent 7c83259 commit b9a752c
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 3 deletions.
3 changes: 3 additions & 0 deletions ModularTegustation/tegu_chemistry/recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@
results = list(/datum/reagent/abnormality/culpusumidus = 1)
required_reagents = list(/datum/reagent/abnormality/tastesyrup = 1, /datum/reagent/abnormality/woe = 1)
required_catalysts = list(/datum/reagent/water = 1)
mob_react = FALSE
mix_message = "The mixture gives off a odor of soggy bread."

/datum/chemical_reaction/serelam
results = list(/datum/reagent/abnormality/serelam = 1)
required_reagents = list(/datum/reagent/abnormality/bittersyrup = 1, /datum/reagent/abnormality/tastesyrup = 1)
mob_react = FALSE
mix_message = "The mixture starts to swirl around."

/datum/chemical_reaction/nepenthe
Expand All @@ -46,6 +48,7 @@
/datum/chemical_reaction/dyscrasone
results = list(/datum/reagent/abnormality/dyscrasone = 2)
required_reagents = list(/datum/reagent/abnormality/heartysyrup = 1, /datum/reagent/abnormality/odisone = 1)
mob_react = FALSE
mix_message = "The mixture starts sizzling."

/*
Expand Down
36 changes: 33 additions & 3 deletions code/modules/reagents/reagent_containers/glass.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,40 @@
return reagents.maximum_volume

/obj/item/reagent_containers/glass/beaker/jar
name = "honey jar"
desc = "A jar for honey. It can hold up to 50 units of sweet delight."
name = "jar"
desc = "A jar for goops and powders. It can hold up to 40 units."
icon = 'icons/obj/chemical.dmi'
icon_state = "vapour"
icon_state = "jar"
volume = 50
spillable = FALSE
fill_icon_thresholds = list(0, 10, 25, 40)

/obj/item/reagent_containers/glass/beaker/jar/pudding
name = "jar of pudding"
desc = "A jar of industrial strength pudding. \
There is several warnings about the \
long term effects of pudding on the top."

/obj/item/reagent_containers/glass/beaker/jar/pudding/Initialize()
. = ..()
var/datum/reagent/pudding = pick(
/datum/reagent/consumable/chocolatepudding,
/datum/reagent/consumable/vanillapudding)
reagents.add_reagent(pudding, 25)

//LC13 Chems
/obj/item/reagent_containers/glass/beaker/jar/syrup_random
name = "jar of syrup"
desc = "A jar for a strange syrup."

/obj/item/reagent_containers/glass/beaker/jar/syrup_random/Initialize()
. = ..()
var/datum/reagent/syrups = pick(
/datum/reagent/abnormality/heartysyrup,
/datum/reagent/abnormality/bittersyrup,
/datum/reagent/abnormality/tastesyrup,
/datum/reagent/abnormality/focussyrup)
reagents.add_reagent(syrups, 25)

/obj/item/reagent_containers/glass/beaker/large
name = "large beaker"
Expand Down
Binary file modified icons/obj/chemical.dmi
Binary file not shown.
Binary file modified icons/obj/reagentfillings.dmi
Binary file not shown.

0 comments on commit b9a752c

Please sign in to comment.