Commit Graph
49 Commits
Author SHA1 Message Date
cc8eab09ef Reagent Containers : The 3/4thening & Contained Spritening (and other related food things) (#17231)
* food and drink

* sabrage

* kanpai and blasted on grain alcohol

* beakers

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* changelog

* the contained sprite-ening....

* deletes old file

* teapot

* aaaaahhhh

* AAAGH INHANDS

* volume = 30

* fixes invalid icon state

* is this really that fucking esoteric

* Revert "is this really that fucking esoteric"

This reverts commit 5b238c7821.

* this should fix it maybe

* fixes 2

* the simple solution

* skibidi toilet

* god dammit

* jyalra

* redundancy

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-06 18:54:20 +00:00
RamkeandGitHub c16b98a568 the meal (#17014) 2023-08-07 10:12:28 +00:00
58f14b2485 Pizza Tweaks (#16806)
* yangechog

* custom pizzas too! just had to finish that one

* gemfix

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-07-24 21:17:51 +00:00
GeevesandGitHub 6fdcf4c897 Hummus Dip Fix (#16796) 2023-07-20 20:33:51 +00:00
WhatsUpBrotendoandGitHub 68e3a9813e More Skrell food and drink (#16656)
* fixes seed packets

fjylozyn and wulumunusha seed packets should now exist

* skrell seed pack sprites

* skrell plant updates

* adds jylara to the snack machine

* skrell alcohol

* skrell drinks

* skrell food

* food sprites

* recipes

* drink sprites

* empty sprites

* reagents

* (some) skrell food options for lunchboxes

* changelog

* credit where credit's due

* haha oopsie! :3

rstweak doesn't exist

* Update drinks.dm

I made a trash item then realised I don't need a trash item, but forgot to delete the related code.
2023-07-11 01:51:09 +00:00
FluffyandGitHub 5e1332d60f OpenDream linting (#16468)
* I wanna set the universe on fire

* dfsaaf

* setup

* dir issue?

* dsf

* Perhaps the script

* saf

* cry

* pain

* sdfas

* Try reintroduction of tag-matcher

* Failed

* Tries to suppress dotnet compile warnings

* Like this maybe?

* woopsie

* Damn pathings

* Hate

* Pragmas

* unlint?

* Maybe?

* GDI

* Redundant ifdef removed and changelog

* Did I forgot the tag matcher, or it was still broken?

* Yea no that script is still broken

* Removed tag-matcher as requested

* *sigh*

* test

* bro what?

* hope

* just fixing the input

* Let's see if we catch it...
2023-06-26 17:05:38 +02:00
a1bddc3920 Removes the brainburger. (#16336)
* Removes the brainburger.

* remove the sprite

* this time for real

* a

* d

* it would end like this

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-05-22 10:35:21 +00:00
GeevesandGitHub 69a3cc7c49 Food Stuff (#16333)
* Food Stuff

* the aussies are ruining my life again
2023-05-17 11:52:32 +00:00
RustingWithYouandGitHub 5799493c24 Unathi Plants (#16321)
* lizard plants

* lizard meals

* seeds in vendors

* changelog
2023-05-13 08:11:45 +00:00
harryobandGitHub 578bae6f6f no relative pathing (#16234)
* the voices win in the end

* cleanup

* changelog

* secure.dm hates me

* make_exact_fit() in initialize instead of whatever was happening before
2023-04-30 21:10:13 +00:00
RamkeandGitHub a1531fc90e finishes what must be done (#16059) 2023-03-20 01:28:58 +00:00
04253d2b11 Tajara Food Expansion (#16035)
* sprites

* code

* fixes

* fixes

* changelog

* Update code/modules/reagents/reagent_containers/food/snacks.dm

FluffyGhoster's capitalisation fix

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* adds missing descriptions, trash

* re-adds neaera meat

* Update code/modules/cooking/recipes/cultural/recipes_tajara.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/snacks.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/snacks.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/snacks.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* updates changelog

* updates changelog more

* Update html/changelogs/ramke - tajfoodexpansion.yml

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* grammar fixes

* Update code/modules/reagents/reagent_containers/food/snacks.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-03-18 19:57:08 +00:00
SleepyGemmyandGitHub f1a4d16fce Fixes the Corn Dog Recipe (#16004) 2023-03-13 19:14:31 +00:00
SleepyGemmyandGitHub b1b91f7f5f Tweaks Some Recipes (#15982)
* Tweaks Some Recipes

* CL

* Fixes Corn Dog Recipe

* Döner Kebab

* CL
2023-03-11 11:02:21 +00:00
dd482c63af Update the codebase to 515. (#15553)
* Update the codebase to 515.

* edit that

* WHOOPS

* maor

* maybe works

* libcall and shit

* do that too

* remove that

* auxtools isnt updated so get rid of it

* actually remove auxtools lol

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-01-23 21:21:37 +01:00
atteriaandGitHub ace53d464f Repaths Spaghetti (#15596) 2023-01-19 12:47:15 +01:00
FluffyandGitHub 04d89f212a Singletons + refactor of /datum/observ + refactor of /decl/ into /singleton/ (#15519) 2023-01-10 19:22:14 +01:00
sheepletsandGitHub ba6e8011eb Boiled fjylozyn is no longer hilariously, life-threateningly toxic (#15517) 2023-01-09 17:31:01 +01:00
GeevesandGitHub 25266bc209 You Taste Uncooked Dough Fix (#15539) 2023-01-07 20:16:53 +01:00
Matt AtlasandGitHub b1869884c1 Revert "Singletons + refactor of /datum/observ (#15487)" (#15515) 2023-01-05 19:21:22 +01:00
FluffyandGitHub 0ddcf0817a Singletons + refactor of /datum/observ (#15487) 2023-01-05 18:41:40 +01:00
granoddandGitHub cde30302d2 Fixes Ashtrays and Adds Non-Berry Pancakes (#15344) 2022-12-20 17:06:06 +01:00
listerlaandGitHub 4ab5fd409b Adds neaera foods and fjylozyn (#14566) 2022-08-14 21:38:01 +02:00
TheStrykerandGitHub e90e6a635b Adds Konyanger food. (#14176) 2022-06-06 08:12:29 +02:00
mikomyazakiandGitHub dae76e0558 Life improvements: Part 1 (#13912) 2022-05-18 14:22:43 +02:00
VisVirificandGitHub b70ced9eff Peanuts, and Toasts, and More (#13209) 2022-02-25 18:34:50 +01:00
martinlyraandGitHub 5a2f491a36 Unit-test kitchen tags in fruits & recipes (#12739) 2021-11-08 20:53:43 -03:00
LocoTokyoFunBusandGitHub 74d08e8f40 Skrell recipe tweak (#12661) 2021-10-22 17:50:33 -03:00
desvenandGitHub bdf6882f65 More lore foods (#12645) 2021-10-19 20:47:28 -03:00
desvenandGitHub b2072d241f Adds some Mictlanian food and drinks to the game (#12559) 2021-10-01 09:33:20 -03:00
desvenandGitHub d6649eae4d Reopens Six new Unathi themed recipes (#12380) 2021-08-26 21:53:18 +02:00
listerlaandGitHub 12949678a2 Adds Vaurca food, drink, and cup. (#12226) 2021-07-28 18:27:30 -03:00
DoxxmedearlyandGitHub 80e96c7d89 Fortune Cookies can be made with blank fortunes (#12030) 2021-06-21 17:49:02 -03:00
Casper3667andGitHub 43f268531b Adds dirtberries to the creamice recipe (#11949) 2021-05-24 16:21:31 +02:00
Casper3667andGitHub ad5c28f27d Adds several new taj food & recipes (#11930) 2021-05-22 21:38:09 -03:00
MarinaGryphonandGitHub 81e7e2fc5b fixes classic hotdog and nomad skewer (#11542) 2021-03-29 12:30:41 -03:00
GeevesandGitHub 299210a08f Pun Pun but Wheat (#11450) 2021-03-18 18:21:50 +01:00
MarinaGryphonandGitHub 2a0ab65e64 Bugfix Collection (#11371) 2021-03-04 21:19:10 +01:00
GeevesandGitHub 0032aca609 Unapologetic Grill Buffs (#11239) 2021-03-01 16:41:49 +01:00
GeevesandGitHub 10d1555d2f Diona Roast Tweak (#11284) 2021-02-27 14:01:32 +01:00
MarinaGryphonandGitHub c720e947ed /decl/chem (#10538) 2021-01-17 00:11:28 +02:00
WildkinsandGitHub 3d9543e877 Bugfix Shotgun 3: The Revengeance (#10737) 2020-12-08 11:45:05 +01:00
AlberykandGitHub 100534dd97 Tajaran Consular Officer Updates: Diplomatic Incident Edition (#10228) 2020-10-14 17:40:36 -03:00
AlberykandGitHub df11c39f37 Fixes the sugar tree candy recipe not working properly (#10231) 2020-10-11 18:31:21 -03:00
GeevesandGitHub bd8d269c7b Emergency Grill Things (#10212) 2020-10-10 00:54:32 +02:00
GeevesandGitHub 687cb99bda Readds Diona and Vaurca Recipes (#10056) 2020-09-24 11:11:24 +03:00
MarinaGryphonandGitHub 05268f8f62 Cooking Bugfixes Round 1 (#9976) 2020-09-12 18:05:53 -03:00
MarinaGryphonandGitHub fcbf1de6e3 Re-adds dionae soup and dionae stew recipes. (#9860) 2020-09-02 15:46:01 +02:00
MarinaGryphonandGitHub f060df8b24 Cooking Update: Cooking Moona (#9454) 2020-09-02 10:49:14 +02:00