diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 829c819faf..36b092556c 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -105,8 +105,9 @@ dat += "Activate Biogenerator!
" dat += "Detach Container

" dat += "Food
" - dat += "10 milk ([round(20/build_eff)])
" - dat += "Slab of meat ([round(50/build_eff)])
" + dat += "10 milk ([round(20/build_eff)]) | x3 | x6
" + dat += "10 cream ([round(20/build_eff)]) | x3 | x6
" + dat += "Slab of meat ([round(50/build_eff)]) | x5 | x10
" dat += "Nutrient
" dat += "E-Z-Nutrient ([round(60/build_eff)]) | x5
" dat += "Left 4 Zed ([round(120/build_eff)]) | x5
" @@ -126,8 +127,8 @@ dat += "Leather Jacket ([round(500/build_eff)])
" dat += "Winter Coat ([round(500/build_eff)])
" dat += "4 Algae Sheets ([round(400/build_eff)])
" //VOREStation Edit - Algae for oxygen generator - //dat += "Other
" - //dat += "Monkey (500)
" + dat += "Other
" + dat += "Monkey (500)
" else dat += "
No beaker inside. Please insert a beaker.
" if("nopoints") @@ -187,8 +188,35 @@ switch(item) if("milk") beaker.reagents.add_reagent("milk", 10) + if("milk30") + beaker.reagents.add_reagent("milk", 30) + if("milk60") + beaker.reagents.add_reagent("milk", 60) + if("cream") + beaker.reagents.add_reagent("cream", 10) + if("cream30") + beaker.reagents.add_reagent("cream", 30) + if("cream60") + beaker.reagents.add_reagent("cream", 60) if("meat") new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + if("meat5") + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + if("meat10") + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) + new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) if("ez") new/obj/item/weapon/reagent_containers/glass/bottle/eznutrient(loc) if("l4z") diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 3b3767077a..7b9e88453b 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -866,6 +866,7 @@ name = "wheat" seed_name = "wheat" display_name = "wheat stalks" + mutants = list("meatwheat") chems = list("nutriment" = list(1,25), "flour" = list(15,15)) kitchen_tag = "wheat" @@ -881,6 +882,17 @@ set_trait(TRAIT_PLANT_ICON,"stalk2") set_trait(TRAIT_IDEAL_LIGHT, 6) set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + +/datum/seed/wheat/meatwheat + name = "meatwheat" + seed_name = "meatwheat" + display_name = "meatwheat stalks" + mutants = null + chems = list("nutriment" = list(1,25), "protein" = list(4,10)) + +/datum/seed/wheat/meatwheat/New() + ..() + set_trait(TRAIT_PRODUCT_COLOUR,"#440000") /datum/seed/rice name = "rice" diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index 92242bc3e6..d2cb01b9df 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -154,6 +154,9 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) /obj/item/seeds/wheatseed seed_type = "wheat" + +/obj/item/seeds/meatwheatseed + seed_type = "meatwheat" /obj/item/seeds/riceseed seed_type = "rice"