diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 909aae3b51f..7b6d2790f6d 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -114,6 +114,7 @@ pixel_y = 23 }, /obj/structure/cable, +/obj/item/storage/bag/trash, /turf/open/floor/plating, /area/security/prison) "aap" = ( @@ -1365,7 +1366,10 @@ /area/security/prison) "adf" = ( /obj/structure/toilet{ - dir = 1 + cistern = 1; + dir = 1; + icon_state = "toilet01"; + open = 0 }, /turf/open/floor/plasteel/freezer, /area/security/prison/toilet) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 70684d07872..c75362bab0e 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -75,7 +75,9 @@ /area/security/prison/toilet) "aak" = ( /obj/structure/toilet{ - dir = 4 + cistern = 1; + dir = 4; + icon_state = "toilet01" }, /obj/machinery/light/small{ dir = 8 @@ -14742,6 +14744,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/item/storage/bag/trash, /turf/open/floor/plasteel, /area/security/prison) "aGK" = ( diff --git a/_maps/map_files/Donutstation/Donutstation.dmm b/_maps/map_files/Donutstation/Donutstation.dmm index ed697a692c7..451b187a05d 100644 --- a/_maps/map_files/Donutstation/Donutstation.dmm +++ b/_maps/map_files/Donutstation/Donutstation.dmm @@ -8093,6 +8093,18 @@ /obj/machinery/atmospherics/pipe/simple/multiz, /turf/open/floor/plasteel, /area/hallway/primary/central) +"asv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Security - Prison Rec Room"; + dir = 9; + network = list("ss13","Security","Prison") + }, +/obj/item/storage/bag/trash, +/turf/open/floor/plasteel, +/area/security/prison/rec) "asw" = ( /obj/machinery/vending/snack/random, /obj/effect/turf_decal/trimline/white/filled/line{ @@ -8141,6 +8153,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/aft) +"asC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet{ + cistern = 1; + dir = 4; + icon_state = "toilet01" + }, +/turf/open/floor/plasteel/dark, +/area/security/prison) "asD" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -13153,6 +13174,15 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"aEd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet{ + cistern = 1; + dir = 8; + icon_state = "toilet01" + }, +/turf/open/floor/plasteel/dark, +/area/security/prison) "aEe" = ( /obj/structure/sink{ dir = 8; @@ -35723,13 +35753,6 @@ "bAT" = ( /turf/open/floor/carpet, /area/chapel/main) -"bAU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/security/prison) "bAV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -35910,13 +35933,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/quartermaster/office) -"bBm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/toilet{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/security/prison) "bBn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 8 @@ -40758,17 +40774,6 @@ /obj/machinery/light, /turf/open/floor/plasteel, /area/security/prison/visit) -"bLc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Security - Prison Rec Room"; - dir = 9; - network = list("ss13","Security","Prison") - }, -/turf/open/floor/plasteel, -/area/security/prison/rec) "bLd" = ( /obj/machinery/light/small, /obj/machinery/power/deck_relay, @@ -103764,13 +103769,13 @@ aiy bDN aMc aeZ -bAU +asC aiN bCt bCX bEf aiN -bAU +asC ajR bJx bJM @@ -104535,13 +104540,13 @@ bBP bDY aMc afy -bAU +asC aiN bCx bCW bEE aiN -bAU +asC ajS bJx bLs @@ -106334,13 +106339,13 @@ bAd bzl aPt ajF -bBm +aEd aiN bCD bCW bEW aiN -bBm +aEd ajX aiN bGM @@ -107105,13 +107110,13 @@ bCP bES aPt ajG -bBm +aEd aiN bCH bDH bFb aiN -bBm +aEd akg aiN aij @@ -107359,7 +107364,7 @@ aYw bjv bAb bCQ -bLc +asv aPt aiN aiN diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index b9a2222b395..f739061cf53 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -8054,6 +8054,8 @@ pixel_y = 2 }, /obj/structure/toilet{ + cistern = 1; + icon_state = "toilet01"; pixel_y = 16 }, /obj/effect/turf_decal/tile/neutral{ @@ -86854,6 +86856,8 @@ pixel_y = 2 }, /obj/structure/toilet{ + cistern = 1; + icon_state = "toilet01"; pixel_y = 16 }, /obj/effect/turf_decal/tile/neutral{ @@ -90447,6 +90451,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/item/storage/bag/trash, /turf/open/floor/plasteel/dark, /area/security/prison) "cIq" = ( @@ -93621,6 +93626,8 @@ pixel_y = 2 }, /obj/structure/toilet{ + cistern = 1; + icon_state = "toilet01"; pixel_y = 16 }, /obj/effect/turf_decal/tile/neutral{ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c7f7d627adb..a9bd16f285a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -223,6 +223,7 @@ name = "old sink"; pixel_y = 28 }, +/obj/item/storage/bag/trash, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -925,6 +926,17 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) +"acl" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/toilet{ + cistern = 1; + dir = 4; + icon_state = "toilet01" + }, +/turf/open/floor/plasteel/freezer, +/area/security/prison/toilet) "acm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -952,14 +964,25 @@ /turf/open/floor/plasteel/dark, /area/security/execution/education) "acp" = ( -/obj/machinery/light/small{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/toilet{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/plasteel/freezer, -/area/security/prison/toilet) +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/mob/living/simple_animal/bot/medbot{ + auto_patrol = 1; + desc = "A little medical robot, officially part of the Nanotrasen medical inspectorate. He looks somewhat underwhelmed."; + name = "Inspector Johnson" + }, +/turf/open/floor/plasteel/white/corner{ + dir = 8 + }, +/area/medical/medbay/central) "acq" = ( /obj/structure/table, /obj/item/storage/box/donkpockets{ @@ -1258,6 +1281,43 @@ }, /turf/open/floor/plasteel/white, /area/security/prison) +"acS" = ( +/obj/structure/closet/crate/necropolis{ + desc = "Presumably placed here by top men."; + name = "\improper Ark of the Covenant" + }, +/obj/item/toy/clockwork_watch{ + desc = "An ancient piece of machinery, made from an unknown metal by an unknown maker."; + name = "\improper Ancient Relic" + }, +/mob/living/simple_animal/pet/dog/corgi{ + desc = "Make sure you give him plenty of bellyrubs, or he'll melt your skin off."; + name = "\improper Keeper of the Ark" + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"acT" = ( +/obj/structure/bed/dogbed/runtime, +/obj/item/toy/cattoy, +/obj/structure/disposalpipe/segment, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/mob/living/simple_animal/pet/cat/Runtime, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/cmo) +"acU" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/airalarm{ + pixel_y = 22 + }, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/medical/virology) "acV" = ( /obj/structure/table, /obj/item/reagent_containers/glass/bottle/morphine{ @@ -1580,6 +1640,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison) +"adv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/medical/virology) "adw" = ( /obj/structure/chair/stool, /obj/machinery/light/small{ @@ -1636,6 +1703,11 @@ }, /turf/open/floor/plasteel/white, /area/security/prison) +"adB" = ( +/obj/structure/cable, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/medical/virology) "adC" = ( /obj/machinery/flasher{ id = "insaneflash"; @@ -47859,26 +47931,6 @@ /obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"cdB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/mob/living/simple_animal/bot/medbot{ - auto_patrol = 1; - desc = "A little medical robot, officially part of the Nanotrasen medical inspectorate. He looks somewhat underwhelmed."; - name = "Inspector Johnson" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/white/corner{ - dir = 8 - }, -/area/medical/medbay/central) "cdC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -54049,20 +54101,6 @@ /obj/structure/cable, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) -"crC" = ( -/obj/structure/bed/dogbed/runtime, -/mob/living/simple_animal/pet/cat/Runtime, -/obj/item/toy/cattoy, -/obj/structure/disposalpipe/segment, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/cmo) "crD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -68475,13 +68513,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"dzq" = ( -/mob/living/carbon/monkey, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/floor/grass, -/area/medical/virology) "dzI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ @@ -72989,11 +73020,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"mfI" = ( -/mob/living/carbon/monkey, -/obj/structure/cable, -/turf/open/floor/grass, -/area/medical/virology) "mha" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -76421,14 +76447,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"ubW" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/mob/living/carbon/monkey, -/obj/machinery/airalarm{ - pixel_y = 22 - }, -/turf/open/floor/grass, -/area/medical/virology) "ueg" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -77165,21 +77183,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space) -"vLX" = ( -/obj/structure/closet/crate/necropolis{ - desc = "Presumably placed here by top men."; - name = "\improper Ark of the Covenant" - }, -/mob/living/simple_animal/pet/dog/corgi{ - desc = "Make sure you give him plenty of bellyrubs, or he'll melt your skin off."; - name = "\improper Keeper of the Ark" - }, -/obj/item/toy/clockwork_watch{ - desc = "An ancient piece of machinery, made from an unknown metal by an unknown maker."; - name = "\improper Ancient Relic" - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "vNJ" = ( /obj/structure/cable, /obj/machinery/door/airlock/virology/glass{ @@ -93619,7 +93622,7 @@ vHP dux mnS dux -vLX +acS dux pLU uzM @@ -94153,7 +94156,7 @@ nrc jwJ sfD pwT -dzq +adv ngK dBN aaa @@ -94406,12 +94409,12 @@ gxl lMJ lMJ cBR -ubW +acU qTL qAX uFb tgQ -mfI +adB dBN lMJ fwb @@ -99699,7 +99702,7 @@ aay abh abA abY -acp +acl aax acZ adq @@ -102872,7 +102875,7 @@ cmu cnG coS cqn -crC +acT csB rAF cCf @@ -103889,7 +103892,7 @@ bXO bZc fmC cbW -cdB +acp ceG cfW chb diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 4dd4fc1301e..156ef59c0d5 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -1892,6 +1892,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/item/storage/bag/trash, /turf/open/floor/plasteel/freezer, /area/security/prison) "agd" = ( diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 8b571819641..252e312405e 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -537,3 +537,55 @@ to_chat(user, "You snuff out the flame on [src].") cut_overlay(GLOB.fire_overlay) active = 0 + +/obj/item/reagent_containers/food/drinks/bottle/pruno + name = "pruno mix" + desc = "A trash bag filled with fruit, sugar, yeast, and water, pulped together into a pungent slurry to be fermented in an enclosed space, traditionally the toilet. Security would love to confiscate this, one of the many things wrong with them." + icon = 'icons/obj/janitor.dmi' + icon_state = "trashbag" + list_reagents = list(/datum/reagent/consumable/prunomix = 50) + var/fermentation_time = 30 SECONDS /// time it takes to ferment + var/fermentation_time_remaining /// for partial fermentation + var/fermentation_timer /// store the timer id of fermentation + +/obj/item/reagent_containers/food/drinks/bottle/pruno/Initialize() + . = ..() + RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/check_fermentation) + +/obj/item/reagent_containers/food/drinks/bottle/pruno/Destroy() + UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + return ..() + +// Checks to see if the pruno can ferment, i.e. is it inside a structure (e.g. toilet), or a machine (e.g. washer)? +// TODO: make it so the washer spills reagents if a reagent container is in there, for now, you can wash pruno + +/obj/item/reagent_containers/food/drinks/bottle/pruno/proc/check_fermentation() + if (!(istype(loc, /obj/machinery) || istype(loc, /obj/structure))) + if(fermentation_timer) + fermentation_time_remaining = timeleft(fermentation_timer) + deltimer(fermentation_timer) + fermentation_timer = null + return + if(fermentation_timer) + return + if(!fermentation_time_remaining) + fermentation_time_remaining = fermentation_time + fermentation_timer = addtimer(CALLBACK(src, .proc/do_fermentation), fermentation_time_remaining, TIMER_UNIQUE|TIMER_STOPPABLE) + fermentation_time_remaining = null + +// actually ferment + +/obj/item/reagent_containers/food/drinks/bottle/pruno/proc/do_fermentation() + fermentation_time_remaining = null + fermentation_timer = null + if(prob(10)) + reagents.add_reagent(/datum/reagent/toxin/bad_food, 15) // closest thing we have to botulism + reagents.add_reagent(/datum/reagent/consumable/ethanol/pruno, 35) + else + reagents.add_reagent(/datum/reagent/consumable/ethanol/pruno, 50) + name = "bag of pruno" + desc = "Fermented prison wine made from fruit, sugar, and despair. You probably shouldn't drink this around Security." + icon_state = "trashbag1" // pruno releases air as it ferments, we don't want to simulate this in atmos, but we can make it look like it did + for (var/mob/living/M in view(2, get_turf(src))) // letting people and/or narcs know when the pruno is done + to_chat(M, "A pungent smell emanates from [src], like fruit puking out its guts.") + playsound(get_turf(src), 'sound/effects/bubbles2.ogg', 25, TRUE) diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 2dfe521ff5a..09227e2c3d2 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -227,8 +227,6 @@ icon_state = "mayonnaise" list_reagents = list(/datum/reagent/consumable/mayonnaise = 50) - - //Food packs. To easily apply deadly toxi... delicious sauces to your food! /obj/item/reagent_containers/food/condiment/pack diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 8f49b5286e6..841fb121686 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -42,6 +42,15 @@ customfoodfilling = 1 foodtype = GRAIN +/obj/item/reagent_containers/food/snacks/breadslice/moldy + name = "moldy bread slice" + desc = "Entire stations have been ripped apart over arguing whether this is still good to eat." + icon_state = "moldybreadslice" + customfoodfilling = 0 + bonus_reagents = list(/datum/reagent/consumable/mold = 10) + tastes = list("decaying fungus" = 1) + foodtype = GROSS + /obj/item/reagent_containers/food/snacks/store/bread/meat name = "meatbread loaf" desc = "The culinary base of every self-respecting eloquen/tg/entleman." diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm index 39589e8fa3b..f29e948adf4 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -102,3 +102,12 @@ ) result = /obj/item/reagent_containers/food/snacks/butterdog subcategory = CAT_BREAD + +/datum/crafting_recipe/food/moldybread // why would you make this? + name = "Moldy Bread" + reqs = list( + /obj/item/reagent_containers/food/snacks/breadslice/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 1 + ) + result = /obj/item/reagent_containers/food/snacks/breadslice/moldy + subcategory = CAT_BREAD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm index dbc46ea5ac8..e89bfa8d0fc 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm @@ -133,3 +133,13 @@ /obj/item/reagent_containers/food/drinks/bottle = 1) category = CAT_DRINK +/datum/crafting_recipe/pruno + name = "pruno mix" + result = /obj/item/reagent_containers/food/drinks/bottle/pruno + time = 30 + reqs = list(/obj/item/storage/bag/trash = 1, + /obj/item/reagent_containers/food/snacks/breadslice/moldy = 1, + /obj/item/reagent_containers/food/snacks/grown = 4, + /obj/item/reagent_containers/food/snacks/candy_corn = 2, + /datum/reagent/water = 15) + category = CAT_DRINK diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 3e3d61e03a2..312660bc93f 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -6,6 +6,7 @@ // Base type. Subtypes are found in /grown dir. Lavaland-based subtypes can be found in mining/ash_flora.dm /obj/item/reagent_containers/food/snacks/grown icon = 'icons/obj/hydroponics/harvest.dmi' + name = "fresh produce" // so recipe text doesn't say 'snack' var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item. var/plantname = "" var/bitesize_mod = 0 diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index d95cd03347d..6629e8f6cd9 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2216,3 +2216,18 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "pina_colada" glass_name = "Pina Colada" glass_desc = "If you like pina coladas, and getting caught in the rain... well, you'll like this drink." + + +/datum/reagent/consumable/ethanol/pruno // pruno mix is in drink_reagents + name = "pruno" + color = "#E78108" + description = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done." + boozepwr = 85 + taste_description = "your tastebuds being individually shanked" + glass_icon_state = "glass_orange" + glass_name = "glass of pruno" + glass_desc = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done." + +/datum/reagent/consumable/ethanol/pruno/on_mob_life(mob/living/carbon/M) + M.adjust_disgust(5) + ..() diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 5754b2f7c5a..8755b256b3d 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -890,3 +890,12 @@ glass_icon_state = "glass_yellow" glass_name = "glass of bungo juice" glass_desc = "Exotic! You feel like you are on vactation already." + +/datum/reagent/consumable/prunomix + name = "pruno mixture" + color = "#E78108" + description = "Fruit, sugar, yeast, and water pulped together into a pungent slurry." + taste_description = "garbage" + glass_icon_state = "glass_orange" + glass_name = "glass of pruno mixture" + glass_desc = "Fruit, sugar, yeast, and water pulped together into a pungent slurry." diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 1125bb3f68d..0a9eb9b7b3f 100755 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -562,6 +562,12 @@ color = "#DFDFDF" taste_description = "mayonnaise" +/datum/reagent/consumable/mold // yeah, ok, togopal, I guess you could call that a condiment + name = "Mold" + description = "This condiment will make any food break the mold. Or your stomach." + color ="#708a88" + taste_description = "rancid fungus" + /datum/reagent/consumable/tearjuice name = "Tear Juice" description = "A blinding substance extracted from certain onions." diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm index 266a58e10ab..606ea8c7ca1 100644 --- a/code/modules/vending/sustenance.dm +++ b/code/modules/vending/sustenance.dm @@ -2,9 +2,10 @@ name = "\improper Sustenance Vendor" desc = "A vending machine which vends food, as required by section 47-C of the NT's Prisoner Ethical Treatment Agreement." product_slogans = "Enjoy your meal.;Enough calories to support strenuous labor." - product_ads = "Sufficiently healthy.;Efficiently produced tofu!;Mmm! So good!;Have a meal.;You need food to live!;Have some more candy corn!;Try our new ice cups!" + product_ads = "Sufficiently healthy.;Efficiently produced tofu!;Mmm! So good!;Have a meal.;You need food to live!;Even prisoners deserve their daily bread!;Have some more candy corn!;Try our new ice cups!" icon_state = "sustenance" products = list(/obj/item/reagent_containers/food/snacks/tofu/prison = 24, + /obj/item/reagent_containers/food/snacks/breadslice/moldy = 15, /obj/item/reagent_containers/food/drinks/ice/prison = 12, /obj/item/reagent_containers/food/snacks/candy_corn/prison = 6) contraband = list(/obj/item/kitchen/knife = 6, diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi index 62ebffdf9ed..ee90f5ee2a3 100644 Binary files a/icons/obj/food/burgerbread.dmi and b/icons/obj/food/burgerbread.dmi differ