Commit Graph

51 Commits

Author SHA1 Message Date
hazelrat
4d5d2c340e Expands hydroponics temperature/light mechanics (#20890)
This is sorta bulky on the changes since it includes a lot of shuffled
documentation, so I'll try to thoroughly summarise here.

- Introduces 'preferential' temperature and light values to plants. This
means that, while a plant is _within_ 5K and 2 lumens of their ideal
heat and ideal light, they will grow faster than otherwise. In the
current implementation, the base growth is a 15% chance of age being
increased, plus another 15% if you're within preferential temps, and
another 5% if within preferential lumens for a maximum of 35%. This is
intended to incentivise engaging with temperature mechanics to grow
plants with unusual requirements.
- This is different to the existing tolerance values, which instead
check whether the plant is _outside_ of them - if they are, it damages
them. Tolerances cause the plant to die if they're too far from their
ideals, preferences cause the plant to grow faster if they're very close
to their ideals. The range of preferences should always be inside
tolerances.
- To work better with this, the ideals of a few kinds of plant have been
tweaked. Mushrooms, Adhomian plants, and molluscs will all **not** be in
their preferences at room temperature - they will need to be cooled,
which can currently be done in D1 hydroponics. A few warmer plants, such
as sugarcane, will need to be warmed up to reach their preferences.
- None of these will go outside of their tolerances at room temperature
- they won't die, they'll just grow slower.
- Most plants will be within all their preferences without any action by
the gardener.

There's also a few assorted QoL changes to hydrotrays, see the
changelog.

---------

Signed-off-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2025-07-12 18:21:31 +00:00
hazelrat
e6994b805f Makes k'ois no longer be perpetually dying (#20906)
The light tolerance was set so low that they were always taking ticking
damage from too much light, since they're bioluminescent, causing them
to invariably die within minutes of being planted. This raises their
tolerance so high that this shouldn't happen at any light level.

I'm not sure if this behaviour was intended - notably, losing it does
mean that k'ois can theoretically survive indefinitely without needing
water or nutrients. I think that's a reasonable trade-off for making it
less frustrating to farm or base an antag gimmick around.
2025-07-01 15:50:44 +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
Wowzewow (Wezzy)
702472583c Scarcity and Supply Chain (#20760)
- rscadd: "Adds Lavatory vendors to the public bathrooms, that dispense
hygiene goods."
- refactor: "Migrates bartender's supply of 6 pack beers and Sencha teas
to the cargo database."
  - refactor: "Migrates impact wrenches to the cargo database."
- balance: "Removes the extraneous dylovene, kelotane, bicaridine and
coagzulug in medical. Migrates medication to the medication closet."
- balance: "Removes the unused Nanomed Minis in medical. Replaces the
surgery side Nanomed Plus with a Nanomed Mini."
- balance: "Removes the two large medical kits from medical storage, and
the kit in the exam room. Moves the wheelchairs from the morgue lift to
medical storage."
- rscadd: "Adds cranberries to the game. Now you can actually make
cranberry juice!"
- refactor: "Juices found in soda machines, booze dispensers and the
booze-o-mat have been migrated to the cargo database."
- rscadd: "Cream and fatshouters milk cartons can be ordered from
cargo."
- balance: "Certain juices are now cartons when separated in a
CondiMaster."
- balance: "Removed coffee, milk and sugar from soda machines, as they
are made redundant by CoffeeMasters."
- balance: "Non-CoffeeMaster coffee machines now just dispense coffee
instead of espresso."

TL;DR
- Juices aren't free anymore - get them from supply, the botanist, or
alternative means.
- Soda machines don't dispense coffee, milk and sugar anymore. Since we
have coffee machines already.
- Migrates the stuff in the bar that just got shoved in through mapping
that shouldve been a cargo order in the first place.
- Adds lavatory vendors, which helps to replace manually mapped in
toiletries.
- Removes the extra medical supplies from medical that end up basically
unused for most rounds.
- Adds more things that can be ordered from supply.
- Un-powercreeps the impact wrench. It's made screwdrivers and wrenches
obsolete. Imagine if all of Medical's hyposprays were the CMO hypospray.
That's how it basically is right now.

It's going to be mildly inconvenient, sure. But I have full faith that
people will get used to it in a month. I feel kind of vindicated after
the suit sensors removal PR that the mass-complaints have ceased to be
an issue, and I feel it's going to be the same case here.

Anyway, yes, it's rather silly that the Big Ass Flagship doesn't
immediately have the latest and greatest stuff, but this is thinking
towards long term towards NBT2, where we'll definitely be running a lot
more slim.

**Also, please. Don't brigade this pull request. Just ping me in the
general Discord if you have anything to bring up. I'll try respond to
you if I'm available.**
2025-05-18 14:13:48 +00:00
Ben
590a5146f1 Produce can now be given Descriptions (+ Adhomai produce descs) (#19552)
Seed code DMdoc'ed and code added to allow for custom descriptions and
extended descriptions for produce.

Adhomai plants given descriptions as proof of concept (maybe)

- [x] Foundation code
- [x] Assassinate Almrah Harrlala
- [x] Adhomai Plants descriptions

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
2024-07-27 10:10:17 +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
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
Matt Atlas
0f70609936 Adds Konyanger tea leaves, teapots, and tea cups. (#18145)
* Adds Konyanger tea leaves, teapots, and tea cups.

* teatray to the glassware

* classic

* teapot correction

* updates

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-01-07 23:45:59 +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
meep109
11cd1acf99 Fixes guami bugging out (#18024)
* fix guami

* Create meep109-fixguami.yml
2023-12-21 12:14:27 +00:00
RustingWithYou
488df55c66 seed fix (#17891) 2023-12-08 14:26:59 +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
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
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
RustingWithYou
0c5ea41216 Hivenet Electronic Warfare + Black K'ois Tweaks (#17234)
* hivenet emergency transmission

* no phoron + harder to remove

* a fuckton of stuff

* hive verbs

* hive admin verbs

* admin verbs again

* encrypt

* mute

* Camera Access, Neural Shock & More

* electronic warfare

* changelog

* changelog 2

* more changelog updates

* Update code/game/objects/items/devices/traitordevices.dm

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

* Update html/changelogs/RustingWithYou - willofthequeens.yml

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

* test failures begone

* ok, now test failures begone

* addresses requested changes

* more requested changes

* missing span classes

* fullshield

* traits!

* addresses requested changes

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/admin/topic.dm

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

* Update code/modules/mob/living/carbon/human/human_powers.dm

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

* Update code/modules/organs/subtypes/vaurca.dm

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

* hivenet checks to proc, admin socket to var

* Update code/modules/organs/subtypes/vaurca.dm

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

* Update code/modules/organs/subtypes/vaurca.dm

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

* parasite.dm span fixes

* spacing

* purge a couple unnecessary returns

* fuck your spaces

* dominia is right bots should be destroyed

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-27 09:19:00 +00:00
Ramke
c16b98a568 the meal (#17014) 2023-08-07 10:12:28 +00:00
Doxxmedearly
2a1fe5acdb Fixes some plants not having growth stages (#16776) 2023-07-19 12:13:10 +00:00
Doxxmedearly
2ad8e7b482 Fixes mulitple invisible sprites (#16719)
* Fixes mulitple invisible sprites

* oh yeah we need these

* Cosmic Cape Fixes
2023-07-14 12:10:26 +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
Butterrobber202
71cd97b2c4 Back in Black (#16517)
* Update mushrooms.dm

* Create koisrevival

* Rename koisrevival to koisrevival.yml
2023-07-02 09:55:31 +00:00
RustingWithYou
c80e65f58e fixes unathi plants (#16506) 2023-06-25 00:38:59 +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
TheDanseMacabre
2a0b326ade Some mob changes (#15737) 2023-02-08 11:28:49 +01:00
Sniblet
e7b5f5fc38 Revert "Adds k'ois contaminated phoron (1)" (#15719) 2023-02-04 03:05:29 +01:00
Sniblet
08010788a3 Adds k'ois contaminated phoron (1) (#15644) 2023-02-03 23:52:13 +01:00
Fluffy
04d89f212a Singletons + refactor of /datum/observ + refactor of /decl/ into /singleton/ (#15519) 2023-01-10 19:22:14 +01:00
Matt Atlas
b1869884c1 Revert "Singletons + refactor of /datum/observ (#15487)" (#15515) 2023-01-05 19:21:22 +01:00
Fluffy
0ddcf0817a Singletons + refactor of /datum/observ (#15487) 2023-01-05 18:41:40 +01:00
Alberyk
6a843ccf64 Adds a new sprite for the peanut (#15320) 2022-12-17 15:03:49 +01:00
SleepyGemmy
c1511cbc71 Changes Jargon to Nralakk (#14734) 2022-09-01 21:47:36 +02:00
listerla
4ab5fd409b Adds neaera foods and fjylozyn (#14566) 2022-08-14 21:38:01 +02:00
Roostercat12
a7b8b5fe0a Adds Grape Jelly and missing Condiment Bottles (#14499) 2022-08-06 16:55:38 +02:00
TheStryker
e90e6a635b Adds Konyanger food. (#14176) 2022-06-06 08:12:29 +02:00
Xxxxyobdab
f08b106522 Berry Redelightful (#12990) 2022-04-19 12:01:52 +02:00
sadkermit
79372075e8 Recreational Drug & Toxins Tweaks & Additions (#13129)
This took way too long.
2022-04-08 16:38:18 +02:00
VisVirific
b70ced9eff Peanuts, and Toasts, and More (#13209) 2022-02-25 18:34:50 +01:00
martinlyra
5a2f491a36 Unit-test kitchen tags in fruits & recipes (#12739) 2021-11-08 20:53:43 -03:00
Xxxxyobdab
c6abfb0653 Vanilla plant, extract, syrup (#12509) 2021-09-24 18:18:23 -03:00
Xxxxyobdab
3dac12ad68 Grapes, wine, mint, tea, coffee (#12485) 2021-09-22 22:47:11 +02:00
Casper3667
ad5c28f27d Adds several new taj food & recipes (#11930) 2021-05-22 21:38:09 -03:00
Geeves
051904d557 K'ois Spores Buff (#11641) 2021-04-18 12:47:15 +02:00
Doxxmedearly
2d912541ff Golden Apple and transmutation bugfix (#11095) 2021-02-01 09:36:45 +01:00
MarinaGryphon
c720e947ed /decl/chem (#10538) 2021-01-17 00:11:28 +02:00
Alberyk
100534dd97 Tajaran Consular Officer Updates: Diplomatic Incident Edition (#10228) 2020-10-14 17:40:36 -03:00
Alberyk
df11c39f37 Fixes the sugar tree candy recipe not working properly (#10231) 2020-10-11 18:31:21 -03:00
Geeves
d155132fa1 Aquaponics and Molluscs (#10067) 2020-10-03 13:48:29 +02:00