241 Commits

Author SHA1 Message Date
deathride58 15e1858862 Merge pull request #16045 from Putnam3145/eggnog-fix
Adds non-alcoholic eggnog
2023-12-29 22:04:59 -05:00
Putnam3145 78982c2e6f typos and other such issues 2023-12-23 14:49:46 -08:00
Putnam3145 e65f386de9 Makes eggnog not alcoholic 2023-12-23 14:22:58 -08:00
Cognition 70dbad7055 Tea dispensing fix 2022-07-22 12:19:54 -06:00
silicons b188a6ea0f why 2021-06-11 16:15:31 -07:00
DrPainis 7dab80cbb7 fuck 2021-05-23 23:42:16 -04:00
DrPainis 51911e1f27 adds the recipe for goliath calamari 2021-05-23 23:36:11 -04:00
silicons 898d1d2c7f Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink
The E-Fink (Yes, really)
2021-05-18 17:08:58 -06:00
silicons 58df45ee3f Merge pull request #14727 from zeroisthebiggay/patch-10
more drink mixture flavortext
2021-05-18 16:44:35 -06:00
WanderingFox95 57d22c6962 Typo 2021-05-17 12:36:12 +02:00
WanderingFox95 a947ec1322 Recipes 2021-05-17 12:30:01 +02:00
zeroisthebiggay a0b83950ae Update drinks_recipes.dm 2021-05-15 12:03:04 -04:00
zeroisthebiggay 03c2f752fa Update drinks_recipes.dm 2021-05-15 11:51:43 -04:00
zeroisthebiggay 2bc5edede0 Update drinks_recipes.dm 2021-05-15 09:51:48 -04:00
zeroisthebiggay 8166167a45 Update drinks_recipes.dm 2021-05-15 09:44:21 -04:00
zeroisthebiggay 1ff27aa732 Update drinks_recipes.dm 2021-05-15 09:43:55 -04:00
zeroisthebiggay 90f9c3cb79 Update drinks_recipes.dm 2021-05-15 09:39:56 -04:00
zerothebigboy 37873d6750 gommit 2021-05-15 08:52:24 -04:00
WanderingFox95 b8292f7f56 Small adjustment to quantity
Oops, it only made 3 instead of 4
2021-04-21 15:15:07 +02:00
WanderingFox95 57938e7b15 Adds the Recipe
2 Ash
1 Lizard Wine
1 Vitrium Froth
2021-04-20 19:36:30 +02:00
ItzGabby 4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
Letter N 021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
shellspeed1 2ffcdb4862 Soups on 2020-10-06 16:07:29 -07:00
silicons c1d8d1d439 Merge pull request #13090 from lolzalolka/lean
Added Burek to Space
2020-08-11 01:42:58 -07:00
chrisbbbbbbb e8ac70696f new food idk? 2020-08-09 18:58:32 +02:00
Winter Flare 76293ee032 My balls are raw. Meatballs, that is. (#13075)
* Food Processor produces Raw Meatball

* No nutrition loss from slabs.
2020-08-09 16:01:52 +02:00
TrilbySpaceClone 0f29235e6a Tea Party 2020-08-04 09:15:44 -04:00
Timothy Teakettle ed8723e74e Merge branch 'master' into species-are-dumb 2020-07-23 22:15:10 +01:00
Timothy Teakettle 8f8aaee36c fixes up drinks 2020-07-23 22:09:14 +01:00
Timothy Teakettle 450509347a tidy species more 2020-07-23 21:57:32 +01:00
Winter Flare 1ebb81e44c Fixes, final tweaks. 2020-07-19 18:52:20 -04:00
Winter Flare 506ddd83fe Meatloaf, Meatball sub, fixes. 2020-07-18 22:16:19 -04:00
Winter Flare 89ecaf3b82 Potato Meals, Sweet and Sour. 2020-07-18 20:53:16 -04:00
Winter Flare d6413d5559 Adds Cracker Box, Soup
Fixes stray pixels on some sushi sprites.
Adds Spiral Soup, Bear Chili
Adds Cracker Box
2020-07-14 22:43:34 -04:00
Winter Flare 870bb8f804 Actual BLT Stuff
This is why I test things. Also, I shouldn't do this before I try to sleep.
2020-07-03 09:48:35 -04:00
Winter Flare bef462b4ae BLT Sandwich 2020-07-03 08:50:54 -04:00
Winter Flare 5b923623d3 Sprite Updates + Food Ports
Ports/Adds, or updates the sprites for:
Cooked Carp
Bear Steaks
Raw and Cooked Chicken
Raw Meatball (Unused, adding for future PR)

Ports:
Chili Cheese Fries
Margarine
BLT (In next Commit)

Fix:
Tuna Sandwich now uses 5u Mayo, instead of 5 jars of mayo.
Tuna Sandwich is now visible.
2020-07-03 08:33:01 -04:00
The0bserver 08be1292cd It's Mad Funny when everything breaks!
And even funnier still when you have to start all over again!
2020-06-11 15:02:17 -04:00
Timothy Teakettle 14c9ab2ff1 ports tgs regal rats (#12479)
* port regal rats

* fix missing line

* royal rat goes after humans too

* okay dont let them attack people

* let them attack people but at less damage

* remove header
2020-06-09 03:28:00 -07:00
Rohesie 2857a13933 nested (#12381) 2020-05-28 14:12:58 +02:00
TrilbySpaceClone c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
TrilbySpaceClone 25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
Timothy Teakettle cd25a7c145 Merge branch 'master' into food-quality 2020-04-17 15:03:44 +01:00
kevinz000 e84e6bface Merge pull request #11857 from Trilbyspaceclone/race_drinks
Race drinks!
2020-04-17 05:20:53 -07:00
Trilbyspaceclone 6f4a3fc179 wine to jello 2020-04-16 17:51:03 -04:00
Trilbyspaceclone 8410d6f35f Why are you like this coffee 2020-04-14 19:40:52 -04:00
TrilbySpaceClone d49210fd48 Merge branch 'master' into race_drinks 2020-04-14 19:21:47 -04:00
TrilbySpaceClone a46a6227a9 Finally done... 2020-04-14 19:11:53 -04:00
Linzolle f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00