diff --git a/code/WorkInProgress/Chemistry-Holder.dm b/code/WorkInProgress/Chemistry-Holder.dm index 72a5598e99c..009cea2b74b 100644 --- a/code/WorkInProgress/Chemistry-Holder.dm +++ b/code/WorkInProgress/Chemistry-Holder.dm @@ -58,6 +58,26 @@ datum return the_id trans_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred. + if (!target) + return + var/datum/reagents/R = target.reagents + amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume) + var/part = amount / src.total_volume + var/trans_data = null + for (var/datum/reagent/current_reagent in src.reagent_list) + var/current_reagent_transfer = current_reagent.volume * part + if(preserve_data) + trans_data = current_reagent.data + R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data) + src.remove_reagent(current_reagent.id, current_reagent_transfer) + + src.update_total() + R.update_total() + R.handle_reactions() + src.handle_reactions() + return amount + +/* if (!target) return var/total_transfered = 0 var/current_list_element = 1 @@ -83,11 +103,11 @@ datum total_transfered++ src.update_total() R.update_total() - R.handle_reactions() handle_reactions() return total_transfered +*/ metabolize(var/mob/M) for(var/A in reagent_list) diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 0ad952a4827..27edce37abb 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -973,8 +973,13 @@ reagents.reaction(M, INGEST) spawn(5) if(reagents.total_volume > bitesize) + /* + * I totally cannot understand what this code supposed to do. + * Right now every snack consumes in 2 bites, my popcorn does not work right, so I simplify it. -- rastaf0 var/temp_bitesize = max(reagents.total_volume /2, bitesize) reagents.trans_to(M, temp_bitesize) + */ + reagents.trans_to(M, bitesize) else reagents.trans_to(M, reagents.total_volume) bitecount++ @@ -2142,6 +2147,34 @@ reagents.add_reagent("capsaicin", 3) bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/popcorn + name = "Popcorn" + desc = "Now let's find some cinema." + icon_state = "popcorn" + New() + ..() + reagents.add_reagent("nutriment", 3) + bitesize = 0.1 + +/obj/item/weapon/reagent_containers/food/snacks/fishburger + name = "Carpburger" + desc = "Nanotracen: wasting rare ingridients for fastfood since 2548" + icon_state = "fishburger" + New() + ..() + reagents.add_reagent("nutriment", 4) + reagents.add_reagent("carpotoxin", 3) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/tofuburger + name = "Togu Burger" + desc = "What.. is that meat?" + icon_state = "tofuburger" + New() + ..() + reagents.add_reagent("nutriment", 4) + bitesize = 1 + /////////////////////////////////////////////////Sliceable//////////////////////////////////////// // All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels diff --git a/code/game/machinery/microwave.dm b/code/game/machinery/microwave.dm index 4a74a7c0e71..2bbc103f607 100644 --- a/code/game/machinery/microwave.dm +++ b/code/game/machinery/microwave.dm @@ -220,7 +220,19 @@ carpmeat_amount = 1 creates = "/obj/item/weapon/reagent_containers/food/snacks/cubancarp" +/datum/recipe/popcorn + extra_item = /obj/item/weapon/reagent_containers/food/snacks/grown/corn + creates = "/obj/item/weapon/reagent_containers/food/snacks/popcorn" +/datum/recipe/fishburger + carpmeat_amount = 1 + flour_amount = 1 + creates = "/obj/item/weapon/reagent_containers/food/snacks/fishburger" + +/datum/recipe/tofuburger + tofu_amount = 1 + flour_amount = 1 + creates = "/obj/item/weapon/reagent_containers/food/snacks/tofuburger" // *** After making the recipe above, add it in here! *** // Special Note: When adding recipes to the list, make sure to list recipes with extra_item before similar recipes without @@ -264,6 +276,9 @@ src.available_recipes += new /datum/recipe/loadedbakedpotato(src) src.available_recipes += new /datum/recipe/cheesyfries(src) src.available_recipes += new /datum/recipe/xenomeatbread(src) + src.available_recipes += new /datum/recipe/popcorn(src) + src.available_recipes += new /datum/recipe/fishburger(src) + src.available_recipes += new /datum/recipe/tofuburger(src) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 585b9115791..75aa89b252b 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 e3971157484..98edbb99442 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ