cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively for vegans 15 soymilk instead of the eggyolk).

Browse Source 
Introduce egg yolk reagent
You can break eggs in open reagent containers or blend them to get egg yolk.
Fixes breadslices sprites and other merge conflict bugs in food.dmi.
Change customizable snack max volume to 60. Buff nutriment amount in doughs.
This commit is contained in:
phil235
2015-03-08 22:15:55 +01:00
parent 95e269e211
commit 1a092e0ede
12 changed files with 62 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+1
View File
@@ -922,6 +922,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
/obj/item/weapon/reagent_containers/food/snacks/grown/oat = list("flour" = -5),
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
/obj/item/weapon/reagent_containers/food/snacks/egg = list("eggyolk" = -5),
//Grinder stuff, but only if dry
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/arabica = list("coffeepowder" = 0),
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
+6
View File
@@ -404,3 +404,9 @@ datum/reagent/consumable/vanilla
reagent_state = SOLID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#FFFACD"
datum/reagent/consumable/eggyolk
name = "Egg Yolk"
id = "eggyolk"
description = "It's full of protein."
color = "#FFB500"
code/modules/reagents/reagent_containers.dm
-18
View File
@@ -77,21 +77,3 @@
return 0
return 1
/obj/item/weapon/reagent_containers/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/egg)) //making dough
var/obj/item/weapon/reagent_containers/food/snacks/egg/E = W
if(flags & OPENCONTAINER)
if(reagents)
if(reagents.has_reagent("flour"))
if(reagents.get_reagent_amount("flour") >= 15)
var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/dough(get_turf(src))
user << "<span class='notice'>You mix egg and flour to make some dough.</span>"
reagents.remove_reagent("flour", 15)
if(E.reagents)
E.reagents.trans_to(S,E.reagents.total_volume)
qdel(E)
else
user << "<span class='notice'>Not enough flour to make dough.</span>"
return
..()