mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-19 05:53:00 +00:00
6a6f81131e
* 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>