mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 22:17:32 +01:00
Adds Tapioca and Cassava plants (#30937)
* dat * Fixes a few issues and makes the pudding look good * fixes all sprites with hope * actually should fix the sprites * fixes cassava sprites and dough recipe oversight * fixes tabbing issues and prevents botany gaming * makes the linter happier + deletes duplicate file * changes many things about the order * generalizes the food reagentcontainer + linter gud * fixes the merge conflict * removes the settings on my vs code from my pr Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> * Adds suggested changes Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> * adds an abstract description * fixes an accidental deletion of vscodesettings * Update code/modules/reagents/reagent_containers/food.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> * adds a missing typepath * Apply suggestions from code review Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> * Propose 2 tapioca pudding sprites. * removes unused tapioca pudding sprite * fixes my paradise.dme file * Add new teas to the bar manual. * adds alfalfa scout's recommended mix message * attempts a fix for the .dme file * removes a deconflicter mistake * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> --------- Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
This commit is contained in:
co-authored by
DGamerL
PollardTheDragon
Alfalfa Scout
parent
a1fc8db55f
commit
6a6f81131e
@@ -1072,6 +1072,8 @@
|
||||
Mix one part each of lemon juice, sugar, and water.
|
||||
<h2>Melonade:</h2>
|
||||
Mix two parts each of lemonade and watermelon juice to one part ice.
|
||||
<h2>Milk Tea:</h2>
|
||||
Mix one part each of tea, sugar, and milk.
|
||||
<h2>Monster Mix:</h2>
|
||||
Mix one part each of soda water, Dr. Gibb, space mountain wind soda, space-up, cola, and ice.
|
||||
<h2>Party Punch:</h2>
|
||||
@@ -1117,6 +1119,10 @@
|
||||
Mix one part TCP Sip (<a href='byond://?src=[UID()];seek_page=8'>Easy Soft Drinks</a>) to one part Triple Citrus (<a href='byond://?src=[UID()];seek_page=7'>Trivial Soft Drinks</a>).
|
||||
<h2>Bubbly Beep: §</h2>
|
||||
Mix one part space cleaner to one part soda water. Custodial or Chemistry can help.
|
||||
<h2>Bubble Milk Tea</h2>
|
||||
Mix three parts Milk Tea (<a href='byond://?src=[UID()];seek_page=8'>Easy Soft Drinks</a>) to one part cooked tapioca pearls. The Kitchen and Botany can help.
|
||||
<h2>Bubble Tea</h2>
|
||||
Mix two parts tea to one part each of sugar and cooked tapioca pearls. The Kitchen and Botany can help.
|
||||
<h2>Cherry Shake:</h2>
|
||||
Mix one part each of cherry jelly, cream, and ice. Botany or the Kitchen can help.
|
||||
<h2>Chocolate Milk:</h2>
|
||||
|
||||
Reference in New Issue
Block a user