87 Commits

Author SHA1 Message Date
tomixcomics 738b72e0b9 Cytherian cuisine, Tajaran tastiness and food fixes (#21881)
<img width="209" height="212" alt="image_2026-02-18_163749448"
src="https://github.com/user-attachments/assets/dd40e552-6752-41bc-8c1f-1d6759ed19e5"
/>

-Adds Cytherian cuisine to the game with 4 specifically cytherian dishes
as well as some popcorn flavors.

-Adds Adhomian cheese and two new Adhomian cuisine dishes for everyone
who has been asking for more Tajaran foods.

-Adds an alternate, vegan way to make dough that doesn't require eggs.

-Adds cheese-less omelettes.

-Adds a few other miscellaneous dishes such as Poutine, Churros, and
chocolate pizzas.

-Adds trays of clams casino now dispense individual clams that can be
eaten seperately.

-Adds a new kitchen bounty for some of the new desserts and added the
new tajaran dishes to the adhomian cuisine bounty.

-Changes North Sixty seafood platters to include regular clams instead
of R'sval clams since R'sval clams are Adhomian and I suspect regular
clams were the intention for this dish all along.

-Renames the old tossed salad to 'apple salad', now that there's a
newer, less fruit-based tossed salad.

-Makes it so onion rings can be placed freely like every other food
instead of being locked to one spot.

-Fixes some food description typos.

---------

Signed-off-by: tomixcomics <11053204+tomixcomics@users.noreply.github.com>
Co-authored-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
2026-02-21 20:24:44 +00:00
tomixcomics e97a1c547d Food buffs for the food buffs (#21731)
-Adds cucumbers as produce
-Adds a few new food dishes (mostly cucumber based and 1 Adhomian dish)
-Returns the randomly generated ingredients spawning in the fridge at
the start of shifts such as condiments, syrups, etc. to spawn in like
they did before the scarcity arc.
-Adds handheld icons to kitchen trays
-Fixed sugar-tree fruit not showing up properly
2026-01-26 14:00:54 +00:00
tomixcomics 13fd3bf54d Cream cheese, beer, bagels and shmear. (#21540)
![sanktions](https://github.com/user-attachments/assets/87dd8da5-d600-4dde-a093-de498a96282a)

-Adds cream cheese to the game because I'm tired of committing the
atrocity of making foods out of blocks of cheese and cream.
-Adds 5 new food dishes to the game including a few commissioned dishes
from Sankt Frederick (The new dishes: Belinas, Bierocks, Cream cheese
bagels, Cream cheese toast, and smoked salmon bagels)
-Adds 2 new beers to the game, a Xanan one and one from Sankt Frederick
-Adds the new beers as well as multiple existing beer bottles to the
Booze-O-Mat because currently there is no place to get any bottles of
beer on the station which is more than a little weird.
2025-11-11 10:56:19 +00:00
Fyni a4a1afcc38 Small Dominia Food & Drink Update (#21440)
Adds two new recipes, one cocktail and one snack item, with a particular
focus on the frontier.

<img width="305" height="389" alt="new food"
src="https://github.com/user-attachments/assets/633b7efc-5cf4-487c-8a22-cd6e14eecf32"
/>

Voidman's Stew - Fishballs in sauce from Sun Reach
Carian Strogonoff - Mushroom strogonoff! (I wanted ot make this slightly
glow but could not get it to work)
Witch-spirit - The trendiest new cocktail, using Reach wine as a base
Algae Chips - Fried and crispy algae from Sun Reach. Available in
Getmore! vendors until somewhere more suitible can be created.

All sprites by myself.

---------

Signed-off-by: Fyni <itsfyni@gmail.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2025-10-30 22:14:24 +00:00
tomixcomics aad2e6bbd4 Let the Pizza wars begin! (New foods added + some food related tweaks) (#21204)
-Added many new food dishes and ingredients (many of them pizzas).
-Added some of the new ingredients to the Cargo order form.
- Added 2 new drinks and a drink bottle for one of them.
-Nerfed a few dishes that require cooking seafood or frying so that you
can no longer make them with the microwave
-Created new vending machine that sells microwave/instant foods to make
up for it and give Microwaves some variety.
-Added shrimp to the required ingredients for North 60 squid.
-Renamed empty Shakshouka pan to be something more generic so it can be
used for other dishes.
-Adjusted the contents of Dyn Pozole so it doesn't take five years to
finish eating.
-Defined a color for S'th berry juice.
-Created new pages and files for microwave foods.


If/when suggesting fixes please be mindful that my knowledge of code is
very limited and many of the more complicated funcitons have been copy
pasted form elsewherein the code and edited to fit, so coommit
suggestions are appreciated.

---------

Signed-off-by: tomixcomics <11053204+tomixcomics@users.noreply.github.com>
Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2025-08-23 10:59:46 +00:00
Wowzewow (Wezzy) a45faab183 Michael Wave, Return of Microwaves (#21072)
- Readds microwaves, and most of their old recipes where applicable.
- Resprites the small oven. It was small and ugly and I hated it.

Now, you may be asking, Wezzy - some of these recipes are an affront to
god. Microwaves can't do that.
And to that I say, It's mostly there to be a decent stand-in for small
rinky-dink maps and ships where you can't particularly fit the whole
kitchen suite in a convenient place. It's nice to have a bit of an
asspull in places like these, so.

Also, donk pockets actually become hot and cool down properly again,
now. It only took 15 years. (jesus christ)

Ported from Bay which ported from us.


![dreamseeker_6aMUIkYymn](https://github.com/user-attachments/assets/76c64677-78b2-4a3b-a35a-002b1cfe7cc7)
2025-08-04 12:20:42 +00:00
Matt Atlas 3837112bd1 Revert "Fix missing pixels in new hairstyle" (#20854)
bad merge
2025-06-17 02:33:31 +02:00
Batrachophreno 156620ad4f Fix missing pixels in new hairstyle (#20828)
See title- the new haircuts leave two pixels of the head uncovered, this
fixes that. My bad, know better testing now... :(
2025-06-16 22:16:59 +00:00
Batrachophreno 230787235d Tajaran ingredient naming consistency (#20781)
Items 1.) and 2.) of [this bug
report](https://github.com/Aurorastation/Aurora.3/issues/20768), with
the blessing of Alberyk in tajara-questions on the lorecord.

Dirtberries and Sugar Trees, as well as products containing them and
recipes referencing them, are to all consistently use their TCB names
mechanically instead of a scattered mix of TCB and Siik'maas. The
descriptions of these items, in cases where it fit nicely, have been
updated to reference their Siik'maas names (in many the items already
did so).

Other species' foods may have this issue (where they have both a native
name and a TCB name used interchangeably in game mechanics like the
cooking codex etc., but I believe if identified they should also have
this basic standard enforced.
2025-06-01 10:55:20 +00:00
tomixcomics c2f17a187d Cooking with Konyang (New foods, food upgrades, and food tweaks) (#20570)
-Adds 8 new food dishes, among them 6 Asian/Konyanger from cuisine (Moss
burger, moss big bite burger, sweet chili chicken, crimson lime,
vegetable eggrolls, and meat eggrolls) and 2 other dishes (dodo ikire
and mozzarella sticks)
-Adds sweet chili sauce
-Adds Macarons to the custom foods you can make with the oven
-Waffles and fries now visually change based on specific syrups or
condiments you pour onto them much like pancakes already do.
-Removed the aspect of batter that makes people nauseous after consuming
it because it was breaking a lot of fried foods.
-Rearranges a bit of code so things are in the right category
-Makes produce boxes more likely to have onions and garlic in them since
there are a lot of recipes that require them.

(NOTE: If/when giving feedback please keep in mind my knowledge of code
is very limited, I may not know some terms you refer to, and some of the
code for more advanced mechanics has been copied and edited from other,
pre-existing bits in the code.)

---------

Signed-off-by: tomixcomics <11053204+tomixcomics@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2025-03-10 08:08:01 +00:00
tomixcomics 22fcc18835 Good gravy, it's a new food (and drinks) update! (#20280)
This update adds:
-6 new food dishes (elotes, steak tartare, biscuits and gravy, and 3
fancy grilled cheeses) (4 of which were special requests made by other
players)
-Gravy and gravy boats
-New sprites for mashed potatoes and schnitzels that had gravy poured on
top of them.
-2 new drinks (dyn boba tea, chocolate soda)
-New sprite for blizzard ear flour boxes because it was really confusing
they had the same sprite as regular flour.

All created and sprited by me.

---------

Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-12-24 12:42:32 +00:00
tomixcomics c5b6e2ceb3 MoghesEats (Adds 12 new food dishes to the game of varying origins) (#19588)
-Adds 12 new food dishes to the game (4 Unathi dishes, 2 Galatean, 1
Tretian, 5 misc.) including some requested dishes such as unathi
desserts and fettucini alfredo. Expands the use of Nakarka
-fixes bug where konaqu wasn't displaying right in the codex
-fixes phrasing on nakarka cheese wheels to be more in line with how
Vaucra talk
-fixes incorrectly named muffin types

---------

Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>
Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com>
2024-07-20 10:37:01 +00:00
Fluffy aeb27e21e1 Fixed vars getting set twice in the same class (#19294)
Fixed vars getting set twice in the same class
2024-06-02 23:13:31 +00:00
Crosarius 0af399e3f9 Moghresian Meat & Unathi Food Nutrition Improvement (#19135)
This PR creates a new subtype of meat, "moghresian meat", specific to
animals which are located in Uueoa-Esa.

It also adds "synthetic" blood to the biogenerator, for use in the many
recipes which require blood (I did this because it's actually impossible
to get blood from cows, chickens, etc - turns out you can't draw blood
frim simplemobs, and people have been either using their own blood, or
making monkey cubes and drawing blood from them, which is WEIRD.
Mechanically the "synthetic" blood is just generic blood. I have no idea
if vampires can abuse this, but it should be no different from them
making monkey cubes in the biogenerator and eating them, so... hopefully
that's ok?)

~I have also done a once-over on the reagent values of all the food in
the Unathi foods dm, and fixed the reagent value for them. Some foods
had far fewer reagents than their constituent ingredients, which
bothered me. I also fixed their flavours so you get nicer messages
instead of "some sort of protein"

I noticed that this food reagent issue is actually prevalent in ALL the
food .DMs. A good example of this is Black Eye Gumbo, which has no
reagents listed. It can be eaten in a single bite and tastes like
nothing, and cannot be ground. I think that some people have added foods
under the impression that the reagents of the ingredients are added by
the cooking process, when this doesn't actually seem to be the case. I
fixed this just for the Unathi foods, but I don't have the time to go
through them all.~

EDIT: Turns out the reagent thing was a red-herring caused by
adminspawning food. Fixed now!
2024-05-15 17:09:56 +00:00
tomixcomics 020acf3253 Foodsplosion (Adds many new food dishes and 1 new drink) (#19065)
Adds 14 new food dishes including
-pigs in a blanket
-alfajores
-grilled peppers
-meat stuffed peppers
-rice stuffed peppers
-peanut butter pita
-omelette pita
-paneer gadpathur
-konaqu
-schnitzel
-schnitzel pita
-cozmo cubes
-nakarka cheese
-nakarka burger

and 1 drink: ne'miik (which is vaurcan milk)

I suspect I mightve screwed something up while merging there are
supposed to be no changes to aurora.dmi so if anyone wants to help me
figure out how to undo that your help would be welcome!

---------

Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>
Co-authored-by: Sparky. <ben.polwart@gmail.com>
2024-05-05 14:16:21 +00:00
DreamySkrell 7d67044010 More muffins (#19038)
momev update


![image](https://github.com/Aurorastation/Aurora.3/assets/107256943/392b224f-1d47-4f61-85cb-77c2c94d33a1)

momev update

---------

Co-authored-by: DreamySkrell <>
2024-05-01 22:36:14 +00:00
tomixcomics 0795be029e [BUGFIX] Corrects drink flavor, adds missing recipe (#18718)
* changes

* added changelog
2024-03-21 18:43:03 +00:00
juniper 16f24d9008 Coalition of Snackolonies II: Fetch Harder Edition (#18626)
* ship it joe

* yangechog

* hoargh

* it's a plastic bottle

* little things

* MEAT

* last bit

* vanilla isn't real

* maps in the vendor + minor additions

* this may fix the Issue

* do this later

* last-minute changes i noticed while i was at work

* my agonies

* aeiou

* keep trying...

* what will this break hmm

* i clench my fist and beat it

* matt's changes

* fixes feni + 2275
2024-03-17 21:56:49 +00:00
tomixcomics fddefa054e Decrease food waste (Kitchens spawn with a few extra ingredients) (#18648)
* first commit

woo

* added changelog

* Update aurorastation.dme

* Update code/game/objects/random/misc.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

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

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

* Update code/game/objects/random/misc.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

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

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

---------

Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-03-17 21:55:12 +00:00
SleepyGemmy 688a7276cb Fixes the Bagel Recipe (#18662) 2024-03-17 21:54:15 +00:00
tomixcomics a61b3d0f2a Eating in Aoyama (New foods, drinks and plants (and some ports!)) (#18605)
* so many theengs!

* Let's commit!

because I haven't in a while!

* final commit fo rnow

* added changelog

* Update TOMIXCOMICS-PR.yml

* ugh

i should've known it was a jinx to refer to a commit as 'final'. bleh.

* added new ramen dish to the ramen vending machine in PV

meant to do that before submitting but had issues with it.
2024-03-09 22:12:06 +00:00
SleepyGemmy 5ccdcc94cb Changes the Chocolate Hazelnut Spread Paths to Lowercase (#18452)
* Changes the Chocolate Hazelnut Spread Paths to Lowercase

* Changelog Entry Type
2024-02-21 13:57:09 +00:00
tomixcomics 3850d6c52f New food as well as updating lasagnas and pancakes (#18412)
* added a bunch of things

* updated pancakes

* more updates

* updated bounty, made changelog
2024-02-17 20:06:30 +00:00
kyres1 8fd19de25c Nugget 4x Multiplication (#18409)
* mcdonalds

* thats not very mcnuggets of you
2024-02-17 00:07:18 +00:00
tomixcomics f05a932212 Adds new foods, fixed food bug and 1 food tweak (#18356)
* created a PR

with a whole buncha stuff :D

* Update recipes_breads.dm
2024-02-08 12:30:19 +00:00
tomixcomics 5e95fa42b6 New foods and drinks, tweaks/updates to old food. (#18140)
* first commit

fixed wooden platter sprite
fixed error in bounty phrasing
created recipe for hash browns
replaced flat dough in doner kebab recipe with a pita
made it so muffins are made in larger batches, and each muffin is less filling seperately
created 7 new kinds of milkshake
changed some incorect capitalization
made it so bread that's been eaten no longer creates leftover plates
updated ravioli code to fit with correct format
updated ravioli to be more filling.

* Roast chicken and River Loaf

created roast chicken and river loaf

* changleog

* corrected changelog

* updated food bug

* grammar update

updating capitalization

* updated bowl pickup ability

* code update
2024-01-09 17:11:55 +00:00
Matt Atlas d5581d7261 Removes a comment from the code. (#18154)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-01-09 12:23:35 +00:00
tomixcomics fec20152b8 New lore foods, Milkshakes, and a bugfix. (#18048)
* New foods, milkshakes, and a bugfix.

* changed syrup colors

* resolved weird merge conflict

* Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

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

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

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

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

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

* made requested changes

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

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

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

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

* Update code/modules/reagents/Chemistry-Recipes.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* made requested changes

* more corrections

* updating again because it didn't take last time

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-12-27 16:40:09 +00:00
tomixcomics c234a555fd NTella food, drinks, and crepes (#17948)
* Notella food, drinks, and crepes

Added some foods and drinks using notella. Made several different kinds of crepes.

* added changelog

changelog wooo

* fixed merge conflicts

* Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* changed all the notella names to NTella

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-12-19 11:46:06 +00:00
tomixcomics 3807930fe6 Adds Several New Foods (#17759)
* broke game while working on update, halp

thanks tech support

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

Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com>

* Added more foods, still WIP

* updating things to see where the bgus are coming from

triolade, palfooz and cake pops are lal broken and idk why yet ._. someone said is hould commit changes and see what the checks say.

* trying to fix triolade and palfouz

* code giving trouble

* finally fixed the issues! woo!

* Got almost everything done and working!

only pitas are left :)

* Final update!

-Added a whole lot of recipes
-Fixed a whole lot of bugs
-Fixed V'krexi wraps from a previous update
-Updated some icons
-Let's submit this thing!

* Adding changelog

Woo, changelog!

* Update Tomixcomics-PR-17759.yml

Whoops, missed a typo.

* trying to solve issues

* fixed bug that was causing runtime errors when recipes were made incorrectly. PR should be good to go now.

* Update code/game/objects/items/trash.dm

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

* Update code/game/objects/items/weapons/storage/fancy.dm

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

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

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

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

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

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

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

* small fixes

deleted folder that wasn't supposed to be included (still no clue why it was there lol) and deleted unnecessary annotation

---------

Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-12-01 12:13:46 +00:00
Acetrea 988f4d146a NT Muffin Sprite Fix (#17801)
* NT Muffin Sprite Fix

Fixes the NT muffin sprite issue

* Remove spaces from changelog

* Fix cargo bounty

* NT Muffin Sprite Fix

* mapfix
2023-11-27 23:19:37 +00:00
Fluffy c25c8b6a37 Last editorconfig fixup (#17782)
* one

* two

* three

* fsdsdf
2023-11-20 18:22:42 +00:00
Pirouette 38e137f3c3 Adds new foods, both IRL and lore (#17745)
* tomixfood

* Update recipes_human.dm

* Update recipes_human.dm

* fixes blue raspberry issue

* Update code/game/objects/items/trash.dm

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

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-11-13 19:50:09 +00:00
SleepyGemmy 3359023925 Fixes the Pretzel Recipe (#17710) 2023-11-01 15:12:10 +00:00
Cody Brittain 4e2b58f02a Added new drugs from lore and otherwise (#16773)
* Initial commit of new drugs

Start on caromeg and oracle

Further work on caromeg

Fix nicotine and caromeg

Begin populating map

Designer cocaine effects

Weaken heroin, Joy now causes genetic damage

Added an artificial alternative to morphine, tramarine, that can be used in its place.

Nerf new opioids, fix tramaline recipe

Added special mentholated adhomian cigarettes, for NKA cigarettes

General fixes

Fix recipe pathing

Add coca leaves, cocaine recipes, and coca drinks

Update Chemistry-Reagents-Medicine.dm

Null name for abstract drug class

Remove abstract_class from reagents (shouldn't be used there)

* Oracle sprites by Wezzy

* .

* Begin resolving issues from code review

* Remove all per-player data from drug singletons

* Resolve Arrow's code review

* Apply suggestions from code review

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

Update code/modules/hydroponics/seed_datums/smokables.dm

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

* Removed coca plants from the standard garden and hydroponics vendors (they remain as contraband and in the xenobotany garden)

* Fix merge conflict errors caused by snack PR

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-20 17:55:13 +00:00
Fluffy 4538e2a7cc Fix indentations (#17481)
* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda
2023-10-05 10:15:58 +00:00
Wowzewow (Wezzy) faca6da739 The Food Sortening, Extra Pain-In-My-Ass Edition (#17393)
* The Food Sortening, Extra Pain-In-My-Ass Edition

Sorts all food sprites and cuts down the MONOLITH snacks.dm and food.dmi. This was an absolute pain in my ass. No front-facing changes.

Planning to add more shit down the line. Makes everyone's lives easier.

* changelol

* finally

* inhands

* merge conflict

* this really "ticked" me off HAHAHAHAHS

* fixes

* make megalinter happy
2023-09-24 22:13:15 +00:00
kyres1 f18d4128ad [WORK IN PROGRESS] Konyang and Point Verdant (#16714)
* starting point verdant

* major progress

* PAIN

* test

* zlevels AAGHHH OH NO

* im scream

* kawnyang

* dam thats good

* Biff Largehuge

* Look Gordon, ropes!

* wawagh

* rgrhgrhrgrh

* Gordon, you're alive! Thank God for that hazard suit.

* help

* frownie face

* wegh

* Gordon! Get away from the beams!

* Good morning, Gordon.

* Signs

* fix multiple proc definition

* initial ambience

* gay rain

* beach and some pebbles literally

* fixing conflicts aUGH

* generation

* guh?

* sewers and beach additions

* maping

* map

* womp womp

* landing zone

* fixing missing shit

* buddha

* ass

* major map updates

* implemented key doors, fixed baloon alert and tasks

* mineral color, adds ozone layer

* real fake walls

* vending subtypes for the regional market

* mooooar

* minimart pt 1

* haneunim skybox

* station mapping progress

* minimart and roboclinic

* offices progress

* bar work

* size change, some polishing of the office + police station

* map size update. Also a fuckton

* tunnels

* more work

* Why doesnt the map initialize

* broke shit

* fixing point verdant spawning, also ocean landing zone

* finishing some buildings

* mapping, village, not finished

* village, main road

* village stuff

* village stuff

* village stuff

* village stuff

* anchoring

* village stuff

* random space tiles fix

* random space tiles fix

* bin fixes

* missing initialize hint on new floors

* fix open space on basement level

* idk

* missing initialize hint

* tests again please

* tests rerun please

* oven/small be gone

* remove shuttle landmarks idk

* bad stairs fix maybe

* fix missing open space above stairs

* tests rerun please

* CircularRandomTurfAround fix

* spaces to tabs

---------

Co-authored-by: atteria <tarkona@protonmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
2023-09-23 21:23:38 +02:00
Wowzewow (Wezzy) 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
Ramke c16b98a568 the meal (#17014) 2023-08-07 10:12:28 +00:00
juniper 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
Geeves 6fdcf4c897 Hummus Dip Fix (#16796) 2023-07-20 20:33:51 +00:00
WhatsUpBrotendo 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
Fluffy 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
Matt Atlas 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
Geeves 69a3cc7c49 Food Stuff (#16333)
* Food Stuff

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

* lizard meals

* seeds in vendors

* changelog
2023-05-13 08:11:45 +00:00
harryob 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
Ramke a1531fc90e finishes what must be done (#16059) 2023-03-20 01:28:58 +00:00
Ramke 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