diff --git a/aurorastation.dme b/aurorastation.dme index 558c2647308..76c18da07de 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -910,6 +910,7 @@ #include "code\game\objects\items\weapons\storage\boxes.dm" #include "code\game\objects\items\weapons\storage\briefcase.dm" #include "code\game\objects\items\weapons\storage\fancy.dm" +#include "code\game\objects\items\weapons\storage\field_ration.dm" #include "code\game\objects\items\weapons\storage\firstaid.dm" #include "code\game\objects\items\weapons\storage\internal.dm" #include "code\game\objects\items\weapons\storage\laundry_basket.dm" diff --git a/code/game/objects/items/weapons/storage/field_ration.dm b/code/game/objects/items/weapons/storage/field_ration.dm new file mode 100644 index 00000000000..7c21cff3c7f --- /dev/null +++ b/code/game/objects/items/weapons/storage/field_ration.dm @@ -0,0 +1,64 @@ +/obj/item/weapon/storage/field_ration + name = "field ration" + desc = "An individually packed meal, designated to be consumed on field." + icon = 'icons/obj/storage.dmi' + icon_state = "ration" + var/preset_ration //if the package comes with one in particular, not a random + +/obj/item/weapon/storage/field_ration/fill() + ..() + new /obj/item/weapon/material/kitchen/utensil/spoon(src) + create_ration() + make_exact_fit() + +/obj/item/weapon/storage/field_ration/proc/create_ration() + var/selected_ration = preset_ration + if(!selected_ration) + selected_ration = pick("Worker's Meal", "NanoTrasen Sponsored") + + switch(selected_ration) + + if("Worker's Meal") + new /obj/item/weapon/reagent_containers/food/snacks/tajaran_bread(src) + new /obj/item/weapon/reagent_containers/food/snacks/adhomian_can(src) + new /obj/item/weapon/reagent_containers/food/drinks/bottle/victorygin(src) + desc += " This one has the stamp of the Republican Army." + + if("NanoTrasen Sponsored") + new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src) + new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src) + new /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater(src) + desc += " This one has the NanoTrasen logo." + +/obj/item/weapon/storage/field_ration/army + preset_ration = "Worker's Meal" + +/obj/item/weapon/storage/field_ration/nanotrasen + preset_ration = "NanoTrasen Sponsored" + +/obj/item/weapon/storage/field_ration/nka + icon_state = "bigbox" + +/obj/item/weapon/storage/field_ration/nka/create_ration() + var/selected_ration = preset_ration + if(!selected_ration) + selected_ration = pick("Imperial Army", "Royal Navy") + + switch(selected_ration) + + if("Imperial Army") + new /obj/item/weapon/reagent_containers/food/snacks/hardbread(src) + new /obj/item/weapon/reagent_containers/food/drinks/cans/adhomai_milk(src) + desc += " This one has the stamp of the Imperial Adhomian Army." + + if("Royal Navy") + new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src) + new /obj/item/weapon/reagent_containers/food/snacks/adhomian_can(src) + new /obj/item/weapon/reagent_containers/food/drinks/bottle/messa_mead(src) + desc += " This one has the stamp of the Royal Navy." + +/obj/item/weapon/storage/field_ration/nka/army + preset_ration = "Imperial Army" + +/obj/item/weapon/storage/field_ration/nka/navy + preset_ration = "Royal Navy" \ No newline at end of file diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm index d63b093c265..60e84288f6a 100644 --- a/code/modules/cargo/random_stock/t1_common.dm +++ b/code/modules/cargo/random_stock/t1_common.dm @@ -65,12 +65,6 @@ STOCK_ITEM_COMMON(lamp, 2.4) STOCK_ITEM_COMMON(mousetrap, 2) new /obj/item/weapon/storage/box/mousetraps(L) -STOCK_ITEM_COMMON(donk, 2) - if (prob(10)) - new /obj/item/weapon/storage/box/sinpockets(L) - else - new /obj/item/weapon/storage/box/donkpockets(L) - STOCK_ITEM_COMMON(sterile, 2) new /obj/item/weapon/storage/box/gloves(L) new /obj/item/weapon/storage/box/masks(L) @@ -467,10 +461,17 @@ STOCK_ITEM_COMMON(snacks, 4) if (!isturf(L)) L = get_turf(pick(CS.tables)) - if(prob(50)) - new /obj/item/weapon/storage/box/snack(L) - else - new /obj/item/weapon/storage/box/produce(L) + var/list/snacks = list( + /obj/item/weapon/storage/box/donkpockets = 10, + /obj/item/weapon/storage/box/sinpockets = 5, + /obj/item/weapon/storage/box/snack = 10, + /obj/item/weapon/storage/box/produce = 8, + /obj/item/weapon/storage/field_ration = 3, + /obj/item/weapon/storage/field_ration/nka = 1 + ) + + var/type = pickweight(snacks) + new type(L) STOCK_ITEM_COMMON(oxytank, 2.5) new /obj/item/weapon/tank/oxygen(L) diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index a1b5f705adb..47b5cf62c41 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -240,6 +240,16 @@ result = /obj/item/weapon/reagent_containers/food/snacks/tajaran_bread reagent_mix = RECIPE_REAGENT_REPLACE +/datum/recipe/hardbread + appliance = OVEN + reagents = list("spacespice" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/tajaran_bread, + /obj/item/weapon/reagent_containers/food/snacks/tajaran_bread, + /obj/item/weapon/reagent_containers/food/snacks/tajaran_bread + ) + result = /obj/item/weapon/reagent_containers/food/snacks/hardbread + //Baked sweets: //--------------- diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index c920f707931..84e7e4f8695 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -1226,8 +1226,8 @@ /datum/seed/nifberries name = "nifberries" - seed_name = "nif-berries" - display_name = "nif-berries shrub" + seed_name = "dirt berries" + display_name = "dirt berries shrub" chems = list("nutriment" = list(0,15), "oil" = list(1,5)) kitchen_tag = "nifberries" @@ -1239,7 +1239,7 @@ set_trait(TRAIT_PRODUCTION,5) set_trait(TRAIT_YIELD,2) set_trait(TRAIT_POTENCY,10) - set_trait(TRAIT_PRODUCT_ICON,"nuts") + set_trait(TRAIT_PRODUCT_ICON,"bean") set_trait(TRAIT_PRODUCT_COLOUR,"#C4AE7A") set_trait(TRAIT_PLANT_COLOUR,"#4D8F53") set_trait(TRAIT_PLANT_ICON,"bush4") diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 114f7a9d8db..36050e97810 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -975,6 +975,22 @@ glass_name = "glass of soy milk" glass_desc = "White and nutritious soy goodness!" +/datum/reagent/drink/milk/adhomai + name = "Fermented Fatshouters Milk" + id = "adhomai_milk" + description = "A tajaran made fermented dairy product, traditionally consumed by nomadic population of Adhomai." + taste_description = "sour milk" + + glass_name = "glass of fermented fatshouters milk" + glass_desc = "A tajaran made fermented dairy product, traditionally consumed by nomadic population of Adhomai." + +/datum/reagent/drink/milk/adhomai/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(alien != IS_TAJARA && prob(5)) + H.delayed_vomit() + /datum/reagent/drink/tea name = "Tea" id = "tea" @@ -3467,7 +3483,7 @@ /datum/reagent/alcohol/winter_offensive name = "Winter Offensive" id = "winter_offensive" - description = "An alcoholic tajaran cocktail, named after a less than successful military campaign." + description = "An alcoholic tajaran cocktail, named after the famous military campaign." color = "#664300" strength = 15 taste_description = "oily gin" @@ -3475,7 +3491,26 @@ glass_icon_state = "winter_offensive" glass_name = "glass of Winter Offensive" - glass_desc = "Proven to be more successful than the campaign." + glass_desc = "An alcoholic tajaran cocktail, named after the famous military campaign." + +/datum/reagent/alcohol/mountain_marauder + name = "Mountain Marauder" + id = "mountain_marauder" + description = "An adhomian beverage made from fermented fatshouters milk and victory gin." + color = "#DFDFDF" + strength = 15 + taste_description = "alcoholic sour milk" + + glass_icon_state = "mountain_marauder" + glass_name = "glass of Mountain Marauder" + glass_desc = "An adhomian beverage made from fermented fatshouters milk and victory gin." + +/datum/reagent/alcohol/mountain_marauder/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(alien != IS_TAJARA && prob(5)) + H.delayed_vomit() // Skrellian drinks //==================== diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 6f468602646..9411e4a1a0a 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2784,6 +2784,13 @@ required_reagents = list("coffee" = 4, "blackpepper" = 1) result_amount = 5 +/datum/chemical_reaction/mountain_marauder + name = "Mountain Marauder" + id = "mountain_marauder" + result = "mountain_marauder" + required_reagents = list("adhomai_milk" = 1, "victorygin" = 1) + result_amount = 2 + //Kaed's Unathi cocktails //======== diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 3889c691165..69efb1e2757 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -245,3 +245,13 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/zorajelly/Initialize() . = ..() reagents.add_reagent("zora_jelly", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/adhomai_milk + name = "fermented fatshouters milk" + desc = "A can of fermented fatshouters milk, imported from Adhomai." + icon_state = "milk_can" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/adhomai_milk/Initialize() + . = ..() + reagents.add_reagent("adhomai_milk", 30) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 8590c2448fe..148a0bb8fbd 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -63,7 +63,8 @@ var/list/lunchables_drinks_ = list( /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice, /obj/item/weapon/reagent_containers/food/drinks/cans/tonic, - /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater + /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater, + /obj/item/weapon/reagent_containers/food/drinks/cans/adhomai_milk ) // This default list is a bit different, it contains items we don't want diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index d921c2f22ca..fde6c323d96 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -5209,8 +5209,8 @@ reagents.add_reagent("water", 4) /obj/item/weapon/reagent_containers/food/snacks/adhomian_can - name = "canned fastshouters meat" - desc = "A piece of salted fastshouter's meat stored inside a metal can." + name = "canned fatshouters meat" + desc = "A piece of salted fatshouter's meat stored inside a metal can." icon_state = "canned" bitesize = 2 trash = /obj/item/trash/can @@ -5335,7 +5335,6 @@ . = ..() reagents.add_reagent("seafood", 4) -//Snacks /obj/item/weapon/reagent_containers/food/snacks/cb01 name = "tau ceti bar" desc = "A dark chocolate caramel and nougat bar made famous in Biesel." @@ -5486,5 +5485,17 @@ . = ..() reagents.add_reagent("sugar", 1) +/obj/item/weapon/reagent_containers/food/snacks/hardbread + name = "adhomian hard bread" + desc = "A long-lasting tajaran bread. It is usually prepared for long journeys, hard winters or military campaigns." + icon_state = "loaf" + bitesize = 1 + nutriment_desc = list("crusty bread" = 2) + nutriment_amt = 15 + throw_range = 5 + throwforce = 10 + w_class = 3 + + #undef NUTRIMENT_GOOD #undef NUTRIMENT_BAD diff --git a/html/changelogs/alberyk-food.yml b/html/changelogs/alberyk-food.yml new file mode 100644 index 00000000000..00fc98b1714 --- /dev/null +++ b/html/changelogs/alberyk-food.yml @@ -0,0 +1,6 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - rscadd: "Added more tajaran cuisine options." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 7c7a1855564..32cefb3df8e 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 217e14aa6da..6ddea40e697 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index d7c3caf8fce..7342d655da8 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ