diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index fc73b3196cc..c4057b34cc5 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -216,154 +216,158 @@ return -/obj/item/trash/beef //ADDITION 04/11/2021 +/obj/item/trash/beef name = "empty beef can" icon_state = "beef" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/beans //ADDITION 04/11/2021 +/obj/item/trash/beans name = "empty bean can" icon_state = "beans" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/spinach //ADDITION 04/11/2021 +/obj/item/trash/spinach name = "empty spinach can" icon_state = "spinach" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/fishegg //ADDITION 04/11/2021 +/obj/item/trash/fishegg name = "empty fisheggs can" icon_state = "fisheggs" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/carpegg //ADDITION 04/11/2021 +/obj/item/trash/carpegg name = "empty carpeggs can" icon_state = "carpeggs" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/salo //ADDITION 04/11/2021 +/obj/item/trash/salo name = "salo pack" icon_state = "pigfat" -/obj/item/trash/croutons //ADDITION 04/11/2021 +/obj/item/trash/croutons name = "suhariki pack" icon_state = "croutons" -/obj/item/trash/squid //ADDITION 04/11/2021 +/obj/item/trash/squid name = "calamari pack" icon_state = "squid" -/obj/item/trash/driedfish //ADDITION 04/11/2021 +/obj/item/trash/driedfish name = "vobla pack" icon_state = "driedfish" -/obj/item/trash/lunacakewrap //ADDITION 04/11/2021 +/obj/item/trash/lunacakewrap name = "cake wrapper" icon_state = "cakewrap" -/obj/item/trash/mochicakewrap //ADDITION 04/11/2021 +/obj/item/trash/mochicakewrap name = "cake wrapper" icon_state = "mochicakewrap" -/obj/item/trash/mooncakewrap //ADDITION 04/11/2021 +/obj/item/trash/mooncakewrap name = "cake wrapper" icon_state = "mooncakewrap" -/obj/item/trash/tidegobs//ADDITION 04/11/2021 +/obj/item/trash/tidegobs name = "tide gob bag" icon_state = "tidegobs" -/obj/item/trash/saturno//ADDITION 04/11/2021 +/obj/item/trash/saturno name = "\improper saturn-Os bag" icon_state = "saturn0s" -/obj/item/trash/jupiter//ADDITION 04/11/2021 +/obj/item/trash/jupiter name = "gello cup" icon_state = "jupiter" -/obj/item/trash/pluto//ADDITION 04/11/2021 +/obj/item/trash/pluto name = "rod bag" icon_state = "pluto" -/obj/item/trash/venus//ADDITION 04/11/2021 +/obj/item/trash/venus name = "hot cakes bag" icon_state = "venus" -/obj/item/trash/mars//ADDITION 04/11/2021 +/obj/item/trash/mars name = "frouka box" icon_state = "mars" -/obj/item/trash/oort//ADDITION 04/11/2021 +/obj/item/trash/oort name = "oort rock bag" icon_state = "oort" -/obj/item/trash/weebonuts//ADDITION 04/11/2021 +/obj/item/trash/weebonuts name = "red alert nuts bag" icon_state = "weebonuts" -/obj/item/trash/stick//ADDITION 04/11/2021 +/obj/item/trash/stick name = "stick" desc = "a stick from some snack or other food item, not even useful as crafting material." icon_state = "stick" -/obj/item/trash/maps//ADDITION 04/13/2021 +/obj/item/trash/maps name = "empty MAPS can" icon_state = "maps" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/spacer_cake_wrap//ADDITION 04/14/2021 +/obj/item/trash/spacer_cake_wrap name = "snack cake wrapper" icon_state = "spacer_cake_wrap" -/obj/item/trash/sun_snax//ADDITION 04/14/2021 +/obj/item/trash/sun_snax name = "sun snax bag" icon_state = "sun_snax" -/obj/item/trash/wasabi_peas//ADDITION 04/14/2021 +/obj/item/trash/wasabi_peas name = "wasabi peas bag" icon_state = "wasabi_peas" -/obj/item/trash/namagashi//ADDITION 04/14/2021 +/obj/item/trash/namagashi name = "namagashi bag" icon_state = "namagashi" -/obj/item/trash/pocky//ADDITION 04/14/2021 +/obj/item/trash/pocky name = "pocky bag" icon_state = "pocky" -/obj/item/trash/appleberry//ADDITION 04/14/2021 +/obj/item/trash/appleberry name = "appleberry can" icon_state = "appleberry" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/hakarl//ADDITION 04/22/2021 +/obj/item/trash/hakarl name = "\improper Indigo Co. Hákarl bag" icon_state = "hakarl" -/obj/item/trash/pretzel//ADDITION 04/22/2021 +/obj/item/trash/pretzel name = "\improper Value Pretzel Snack" icon_state = "pretzel" -/obj/item/trash/sweetration//ADDITION 04/20/2021 +/obj/item/trash/sweetration name = "desert ration bag" icon_state = "baseration" -/obj/item/trash/genration//ADDITION 04/20/2021 +/obj/item/trash/genration name = "generic ration bag" icon_state = "genration" -/obj/item/trash/meatration//ADDITION 04/20/2021 +/obj/item/trash/meatration name = "meat ration bag" icon_state = "meatration" -/obj/item/trash/vegration//ADDITION 04/20/2021 +/obj/item/trash/vegration name = "veggie ration bag" icon_state = "vegration" +/obj/item/trash/tgmc_mre + name = "\improper CRS ration bag" + icon_state = "tgmc_mre_trash" + \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/mre.dm b/code/game/objects/items/weapons/storage/mre.dm index 50536564d3b..9b9f7d0a08c 100644 --- a/code/game/objects/items/weapons/storage/mre.dm +++ b/code/game/objects/items/weapons/storage/mre.dm @@ -288,3 +288,98 @@ MRE Stuff /obj/item/weapon/storage/mrebag/dessert/menu11 starts_with = list(/obj/item/weapon/pen/crayon/rainbow) + +// TGMC MREs - Smaller, less trash +/obj/item/weapon/storage/box/tgmc_mre + name = "\improper CRS MRE" + desc = "Meal Ready-to-Eat, meant to be consumed in the field, prepared by the Commonwealth Ration Service. It says it's government property..." + icon = 'icons/obj/food.dmi' + icon_state = "tgmc_mre" + w_class = ITEMSIZE_SMALL + can_hold = list() + storage_slots = 5 + max_w_class = 0 + foldable = null + var/isopened = 0 + +/obj/item/weapon/storage/box/tgmc_mre/Initialize() + . = ..() + pickflavor() + +/obj/item/weapon/storage/box/tgmc_mre/Destroy() + var/turf/T = get_turf(src) + if(T) + new /obj/item/trash/tgmc_mre(T) + return ..() + +/obj/item/weapon/storage/box/tgmc_mre/proc/pickflavor() + var/entree = pick("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti", "chicken tenders") + var/side = pick("meatballs", "cheese spread", "beef turnover", "mashed potatoes") + var/snack = pick("biscuit", "pretzels", "peanuts", "cracker") + var/desert = pick("spiced apples", "chocolate brownie", "sugar cookie", "choco bar") + + name = "[initial(name)] ([entree])" + + new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, entree) + new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, side) + new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, snack) + new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, desert) + new /obj/random/mre/drink(src) + +/obj/item/weapon/storage/box/tgmc_mre/remove_from_storage() + . = ..() + if(. && !contents.len && !gc_destroyed) + qdel(src) + +/obj/item/weapon/storage/box/tgmc_mre/update_icon() + if(!isopened) + isopened = 1 + icon_state = "tgmc_mre_opened" + +// The sneaky food-looks-like-a-package items +/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component + name = "\improper MRE component" + package = TRUE + bitesize = 1 + icon_state = "tgmcmre_entree" + var/flavor = "boneless pork ribs" + +/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/Initialize(mapload, newflavor) + determinetype(newflavor) + desc = "A packaged [flavor] from a Meal Ready-to-Eat, there is a lengthy list of [pick("obscure", "arcane", "unintelligible", "revolutionary", "sophisticated", "unspellable")] ingredients and addictives printed on the back." + . = ..() + +/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/attack_self(mob/user as mob) + if (package) + to_chat(user, "You pull open the MRE package!") + playsound(loc,'sound/effects/pageturn2.ogg', 15, 1) + name = "\improper" + flavor + desc = "The contents of a standard issue CRS MRE. This one is " + flavor + "." + icon_state = "tgmcmre_[flavor]" + package = FALSE + +/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/proc/determinetype(newflavor) + name = "\improper MRE component" + " (" + newflavor + ")" + flavor = newflavor + var/static/tastes = list("something scrumptious","nothing","the usual grub","something mediocre","hell","heaven","tentalization","disgust","dog food","cat food","fish food","recycled pizza","junk","trash","rubbish","sawdust","nutraloafs","gourmand food","gourmet food","moistness","squalidness","old grub","actually good food","bleach","soap","sand","synthetic grub","blandness","prison food","Discount Dan's","Discount Dan's Special","Discount Dan's leftovers","yesterday leftovers","microwaved leftovers","leftovers","UPP rations","uncooked grub","overcooked grub","not-so-bad grub","pinapple pizza flavored grub","mystery food","burnt food","frozen food","lukewarm food","rancidness","processed grub","crunchiness","faux meat","something false","low-calorie food","high-carb food","transfat-free food","gluten-free food","delictableness","acid","mintiness","sauciness","saltiness","extreme saltiness","spiced grub","crispness","questionable grub","something untastable","bitterness","savoriness","sourness","sweetness","umami","chewing gum","shoe polish","the jungle","indigestion","oldberries","butter","lard","oil","grass","cough syrup","water","iron","rubber","lead","bronze","wood","paper","plastic","kevlar","cloth","buckshot","gunpowder","black powder","petroleum","gasoline","diesel","biofuel","paint","jelly","slime","sludge","tofu","dietetic food","counterfeit food","grossness","dryness","tartiness","cryogenic juice","the secret ingredient","the ninth element","compressed matter","deep-fried food","double-fried food","a culinary apocalypse","experimental post-modern cuisine","a disaster","muckiness","mustard","mordant","citruses","crayon dust") + var/new_taste = pick(tastes) + + switch(newflavor) + if("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti", "chicken tenders") + icon_state = "tgmcmre_entree" + nutriment_amt = 5 + starts_with = list("sodiumchloride" = 1) + if("meatballs", "cheese spread", "beef turnover", "mashed potatoes") + icon_state = "tgmcmre_side" + nutriment_amt = 3 + starts_with = list("sodiumchloride" = 1) + if("biscuit", "pretzels", "peanuts", "cracker") + icon_state = "tgmcmre_snack" + nutriment_amt = 2 + starts_with = list("sodiumchloride" = 1) + if("spiced apples", "chocolate brownie", "sugar cookie", "choco bar") + icon_state = "tgmcmre_dessert" + nutriment_amt = 2 + starts_with = list("sugar" = 1) + + nutriment_desc = list("[new_taste]" = nutriment_amt) diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index ce7204202d3..9e5d5d6d8f8 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 76f60a84ced..7e9e20670e2 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ