Rerun of "Add Reagent Grinder/Juicer" (#2570)
* commit skeleton reagent grinder component * add reagentgrinder bounduserinterface, add suffix to grinder yml, add reagentgrinder sprites * implement much more of the grinder ui functionality * get more use out of hasbeaker bool * complete wiring up most of the chamber/beaker UI controls * remove whitelist prototype id. add grindable tag component * add juiceable component * rename boolparam to be clearer * more juice * add some juice reagents and apply them to their drink prototypes * re add glassyellow * implement juicing and results * add time delay to grindjuice * add reagent grinder visualizer, add reagent grinder sounds, fix some yaml errors too * interface has clear indication of currennt operation, and busy status * add ReagentGrinder to Client ignnored components * Update Content.Client/GameObjects/Components/Kitchen/ReagentGrinderBoundUserInterface.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Update Content.Client/GameObjects/Components/Kitchen/ReagentGrinderBoundUserInterface.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Update Content.Shared/Kitchen/SharedReagentGrinderComponent.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * implemennt sloth changes * fix isbusy * Disable grind/juice buttons if there's nothing to grind or juice, also some misc fixes * unsubscribe from messages on remove + fix xmlcomment * fix bounding box * Add these to dictionary * Add these to client ignore * Whitespace and unneeded import fixes * tommy's toes * Where'd these newlines come from * power * improve bounding box * Check power better & show contents when beaker is ejected * check power here * Disable eject buttons when running * improve comments * readwrite for viewvars on work time and capacity * Address most of Sloth's reviews * Make this cleaner * add grindablecomponent to motherfucking everything * Fix reviews * some more null suppressions * remove unused random field Co-authored-by: scuffedjays <yetanotherscuffed@gmail.com> Co-authored-by: namespace-Memory <66768086+namespace-Memory@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
@@ -182,7 +182,7 @@
|
||||
- type: reagent
|
||||
id: chem.Tea
|
||||
name: tea
|
||||
desc: A made by boiling leaves of the tea tree, Camellia sinensis.
|
||||
desc: A drink made by boiling leaves of the tea tree, Camellia sinensis.
|
||||
physicalDesc: aromatic
|
||||
color: "#8a5a3a"
|
||||
metabolism:
|
||||
@@ -253,3 +253,152 @@
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
|
||||
#Juices
|
||||
- type: reagent
|
||||
id: chem.AppleJuice
|
||||
name: apple juice
|
||||
desc: It's a little piece of Eden.
|
||||
physicalDesc: crisp
|
||||
color: "#FDAD01"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
- type: reagent
|
||||
id: chem.BerryJuice
|
||||
name: berry juice
|
||||
desc: A delicious blend of several different kinds of berries.
|
||||
physicalDesc: sweet
|
||||
color: "#660099"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
- type: reagent
|
||||
id: chem.BananaJuice
|
||||
name: banana juice
|
||||
desc: The raw essence of a banana. HONK.
|
||||
physicalDesc: crisp
|
||||
color: "#FFE777"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
#TODO: port on_mob_life: restore eyesight
|
||||
#if(..())
|
||||
#return 1
|
||||
# M.eye_blurry = max(M.eye_blurry - 1 , 0)
|
||||
# M.eye_blind = max(M.eye_blind - 1 , 0)
|
||||
# switch(data)
|
||||
# if(21 to INFINITY)
|
||||
# if(prob(data - 10))
|
||||
# M.disabilities &= ~NEARSIGHTED
|
||||
# data++
|
||||
|
||||
- type: reagent
|
||||
id: chem.CarrotJuice
|
||||
name: carrot juice
|
||||
desc: It's like a carrot, but less crunchy.
|
||||
physicalDesc: crisp
|
||||
color: "#FF8820"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
- type: reagent
|
||||
id: chem.LimeJuice
|
||||
name: lime juice
|
||||
desc: The sweet-sour juice of limes.
|
||||
physicalDesc: citric
|
||||
color: "#99bb43"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
- type: reagent
|
||||
id: chem.LemonJuice
|
||||
name: lemon juice
|
||||
desc: This juice is VERY sour.
|
||||
physicalDesc: citric
|
||||
color: "#fff690"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
- type: reagent
|
||||
id: chem.GrapeJuice
|
||||
name: grape juice
|
||||
desc: Freshly squeezed juice from red grapes. Quite sweet.
|
||||
physicalDesc: crisp
|
||||
color: "#512284"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
|
||||
# /datum/reagent/drink/orangejuice/on_mob_life(var/mob/living/M)
|
||||
|
||||
# if(..())
|
||||
# return 1
|
||||
|
||||
# if(M.getToxLoss() && prob(20))
|
||||
# M.adjustToxLoss(-REM)
|
||||
|
||||
- type: reagent
|
||||
id: chem.OrangeJuice
|
||||
name: orange juice
|
||||
desc: Both delicious AND rich in Vitamin C. What more do you need?
|
||||
physicalDesc: citric
|
||||
color: "#E78108"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
- type: reagent
|
||||
id: chem.TomatoJuice
|
||||
name: tomato juice
|
||||
desc: Tomatoes made into juice. What a waste of good tomatoes, huh?
|
||||
physicalDesc: saucey
|
||||
color: "#731008"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
# /datum/reagent/drink/poisonberryjuice/on_mob_life(var/mob/living/M)
|
||||
|
||||
# if(..())
|
||||
# return 1
|
||||
|
||||
# M.adjustToxLoss(1)
|
||||
|
||||
- type: reagent
|
||||
id: chem.PoisonBerryJuice
|
||||
name: poison berry juice
|
||||
desc: A surprisingly tasty juice blended from various kinds of very deadly and toxic berries.
|
||||
physicalDesc: aromatic #maybe should be 'sickly'?
|
||||
color: "#6600CC"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
- type: reagent
|
||||
id: chem.WatermelonJuice
|
||||
name: water melon juice
|
||||
desc: The delicious juice of a watermelon.
|
||||
physicalDesc: sweet
|
||||
color: "#EF3520"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
- type: reagent
|
||||
id: chem.PotatoJuice
|
||||
name: potato juice
|
||||
desc: Juice of the potato. Bleh.
|
||||
physicalDesc: starchy
|
||||
color: "#302000"
|
||||
metabolism:
|
||||
- !type:DefaultDrink
|
||||
rate: 1
|
||||
|
||||
Reference in New Issue
Block a user