From ced3668ebc04af86ff4c21415fa5c10b658f0fe3 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Tue, 25 Sep 2018 14:55:36 -0400 Subject: [PATCH] Prison food tastes gross now. (#40421) * Prison food tastes bad. * typo * less clunky writing?? --- code/modules/food_and_drinks/drinks/drinks.dm | 5 +++++ code/modules/food_and_drinks/food/snacks_meat.dm | 6 ++++++ code/modules/food_and_drinks/food/snacks_other.dm | 8 ++++++++ code/modules/vending/sustenance.dm | 6 +++--- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 9256f5bdd1e..859829a5dbf 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -207,6 +207,11 @@ spillable = TRUE isGlass = FALSE +/obj/item/reagent_containers/food/drinks/ice/prison + name = "dirty ice cup" + desc = "Either Nanotrasen's water supply is contaminated, or this machine actually vends lemon, chocolate, and cherry snow cones." + list_reagents = list("ice" = 25, "liquidgibs" = 5) + /obj/item/reagent_containers/food/drinks/mug/ // parent type is literally just so empty mug sprites are a thing name = "mug" desc = "A drink served in a classy mug." diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index f0c1a1d699b..b2b9f10decc 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -65,6 +65,12 @@ tastes = list("tofu" = 1) foodtype = VEGETABLES +/obj/item/reagent_containers/food/snacks/tofu/prison + name = "soggy tofu" + desc = "You refuse to eat this strange bean curd." + tastes = list("sour, rotten water" = 1) + foodtype = GROSS + /obj/item/reagent_containers/food/snacks/spiderleg name = "spider leg" desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?" diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index ecb3cfb2ba5..7995edc918e 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -39,6 +39,14 @@ tastes = list("candy corn" = 1) foodtype = JUNKFOOD | SUGAR +/obj/item/reagent_containers/food/snacks/candy_corn/prison + name = "desiccated candy corn" + desc = "If this candy corn were any harder Security would confiscate it for being a potential shiv." + force = 1 // the description isn't lying + throwforce = 1 // if someone manages to bust out of jail with candy corn god bless them + tastes = list("bitter wax" = 1) + foodtype = GROSS + /obj/item/reagent_containers/food/snacks/chocolatebar name = "chocolate bar" desc = "Such, sweet, fattening food." diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm index 53401804b8f..c703142c6d6 100644 --- a/code/modules/vending/sustenance.dm +++ b/code/modules/vending/sustenance.dm @@ -4,9 +4,9 @@ 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!" icon_state = "sustenance" - products = list(/obj/item/reagent_containers/food/snacks/tofu = 24, - /obj/item/reagent_containers/food/drinks/ice = 12, - /obj/item/reagent_containers/food/snacks/candy_corn = 6) + products = list(/obj/item/reagent_containers/food/snacks/tofu/prison = 24, + /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, /obj/item/reagent_containers/food/drinks/coffee = 12, /obj/item/tank/internals/emergency_oxygen = 6,