diff --git a/ModularTegustation/tegu_chemistry/recipes.dm b/ModularTegustation/tegu_chemistry/recipes.dm index c08c9bd8de25..09c58451a53b 100644 --- a/ModularTegustation/tegu_chemistry/recipes.dm +++ b/ModularTegustation/tegu_chemistry/recipes.dm @@ -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 @@ -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." /* diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 5788fec73382..f1cb030b4344 100755 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -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" diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 2a2e9c65c18f..266dcf63e68e 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index b700a1937a4a..51bc7977be0f 100644 Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ