### What does this achieve?
This overhauls hydroponics to integrate atmospherics mechanics more
heavily, with the hope of establishing the foundations of much more
significant mechanical depth to what has been a very shallow job for a
very long time.
Currently, this is limited to the preferences and tolerances system -
hydroponics is now comprised of five 'reservoirs' of segmented portions
of the pipe system connected to trays, with a gas heater and cooler to
change temperature across the entire system, and you can cut off each
reservoir with valves to separate it from the rest and maintain its
current temperature.
Five tiers, each with a trait, have been implemented for the different
heat ideals of different plants. Plants from Adhomai and Moghes are the
most environmentally extreme, and cannot be grown outside of drastically
low and high temperatures respectively, limiting them to hydroponics
proper, whereas colder and warmer terrestrial plants can be grown at
room temperature but will grow much slower than if they were within
their preferences. **This means there will be plants that outright
cannot be grown in the garden.**
With this, hydroponics becomes an atmos puzzle. If you need to grow
nothing but mushrooms you'll probably send every tray cold, but if you
need a diversity of different temperature ranges you'll have to
fine-tune your setup and routine to have everything within their
preferences. Once you're done growing mushrooms off one reservoir, you
may turn the heat in it up so you can grow citrus, etc etc.
This also solves several bugs and makes a lot of QoL changes, the full
changelog will list everything.
<img width="608" height="320" alt="image"
src="https://github.com/user-attachments/assets/12e53224-d9be-4e69-9c48-6185d3303a14"
/>
<img width="384" height="608" alt="image"
src="https://github.com/user-attachments/assets/1a0c2b0c-8ad6-4f5c-b992-2e78035ab52d"
/>
<img width="640" height="512" alt="image"
src="https://github.com/user-attachments/assets/1cf837d1-3db5-440a-a465-071841febaea"
/>
### What about the mapping?
Atmos has been integrated into every hydroponics tray in the mapping
changes, rather than only on D1 like at present, to support the new
mechanics. I've moved as much stuff up to D2 as I could fit, in the
interest of getting players to the more visible and socially viable spot
rather than hiding in their basement. D1 is now exclusively intended as
a storage area, laboratory, and now has an expanded Hazardous Specimens
unit.
### To-do before review
- [x] Ensure that chefs can still do alien-specific menus without a
hydroponicist, now that they can't necessarily grow their stuff in the
garden - loadout produce box, maybe?
- [x] Remap xenobotany
- [x] Review whether every alien crop can still grow on its respective
in-game exoplanet - Adhomai might be okay? (Adhomai is essentially fine,
Moghes will need work before we go back into the sector)
- [x] Make sure the yield_mod interactions aren't explosive.
### Known issues
1. Yes, the examine on hydroponics trays is huge. In the long-term, IMO
this should probably be a TGUI.
2. The TGUI on seed storage units is clunky, this is also on the to-do
list for the future.
3. The logic for calculating growth is bad, it's very RNG-skewed.
Another thing for later.
4. Atmos mechanics like these can be pretty opaque to players, so this
will certainly require a wiki update shortly after merge describing
exactly what steps you should take to operate the new atmos equipment.
As the title says. The PR was done on the request of VeteranGary with
sprites provided by Noble Row.
The reasoning for it is to give some more visual variety, by allowing it
to appear over the standard security armor plate. It has been added as a
belt for that purpose, with the reasoning that there is the explorer's
belt that similarly is a chestrig.
### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR:
| Path | Original Author | License |
| --- | --- | --- |
| icons/mob/belt.dmi | Noble Row (Aurora Station) | CC0 |
| icons/obj/clothing/belts.dmi | Noble Row (Aurora Station) | CC0 |
Adds S'rendmarr and Ma'ta'ke versebooks to the game. Thanks to Tajara
Lore (especially @WilliamMurdoch) for the lore bits
Versebooks were added to loadout and now replaces the previous bible for
Tajaran priests.
In the future it might be best to merge the capabilities of bible with
versebooks (so religious versebooks can make holy water)
### Example Verses
S'rendmarr: _There is always hope beneath the light of the suns. Do not
fret at the horrors of this world, o child! Your guardians watch from
above._
Ma'ta'ke: _At that moment the king boasted of his victory and Mata’ke
quickly drew his sword, stabbing the king in his black heart who fell to
the floor. “One’s temper dictates the battle,” said Mata’ke as he wept
for his fallen battle-brother._
<img width="338" height="269" alt="image"
src="https://github.com/user-attachments/assets/da5311b6-e69a-4201-b268-099384f20f59"
/>
---------
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
Little more tuneup of area metadata, and also replaces area.name in
several locations with dynamic area display names (for example:
announcement that something was beamed aboard a thruster will once more
indicate whether it was the port or starboard thruster).
- Reworked prices, wages and balances of (almost) everything ingame.
- Added coinage and decimal support to cash, ruthlessly sanitized to
avoid floating-point errors. Reflected in cash-related things like ATMs.
- Tweaked how cash bundles are made and distributed to support
decimalization.
- Adjusted the starting money individuals and departments receive in
their accounts.
- Adjusted the funding Tajara, Unathi, Diona, Vaurca, and IPCs receive
in their accounts. Should earn more on average than they used to.
Credit values are now roughly 1/10th what they were before, across the
board.
Coins were added too! These have names:
- Unie: 0.01 credits
- Quin: 0.05 credits
- Dece: 0.10 credits
- Quarter: 0.25 credits
These can be seen cameo'd in the screenshots below.
Values, wages, etc, are based on the wiki page
https://wiki.aurorastation.org/index.php?title=Guide_to_Wages_and_Pay .
Values are not anchored to any singular real-world currency.
Example price differences:
| Example Item | Old Price | New Price |
| --- | --- | --- |
| Comet Cola | 15.00 | 1.50 |
| Cup Ramen | 20.00 | 2.00 |
| Jyalara | 38.00 | 3.00 |
| Trans-Stellar Cigarettes | 76.00 | 9.00 |
| Zo'ra Soda | 29.00 | 2.50 |
| Gumball | 5.00 | 0.25 |
| 50x plasteel sheets | 700.00 | 120.00 |
| 5x meat (cargo) | 160.00 | 55.00 |
| 50x phoron crystals (cargo) | 2200.00 | 400.00 |
Wages and account balances have also been tweaked:
| Type | Old Amount | New Amount |
| --- | --- | --- |
| Ship Account | 75,000.00 | 35,000.00 |
| Departmental Accounts | 10,000.00 | 15,000.00 |
| Personal Account (avg) | 200.00 - 20,000.00 | 20.00 - 2,000.00 |
Might break the economy; prices will likely need some adjusting
depending on gameplay constraints. Can be adjusted in TMs.
A little testing never hurt anyone.
---------
Signed-off-by: naut <55491249+nauticall@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
See changelog for the full list, several little QoL things coming off
https://github.com/Aurorastation/Aurora.3/pull/20890.
The most notable mechanical change is that, if outside of their light of
heat tolerances (or otherwise afoul whatsoever of the handle_environment
proc), plants will stop growing. This is to avoid the awkward
interaction of a plant being grown at completely improper temperatures
or light levels still managing to mature before it dies.
Makes hydroponicists spawn with full belts at roundstart. Engineers do
and machinists do, it just cuts down on a little roundstart begrudgery.
Includes light and heat preferences on seed packets!
<img width="633" height="118" alt="image"
src="https://github.com/user-attachments/assets/4ac4b728-072a-4510-bb52-c9e5ed76c6a5"
/>
Coming up next will be extended descriptions explaining the mechanics
somewhere visible to players, once
https://github.com/Aurorastation/Aurora.3/pull/20923 is in.
Extends and reworks how various extended information text (desc_info,
desc_build, desc_upgrades) are handled to make object interactions and
mechanics A.) much more clearly documented in-game and B.) much easier
to support from the back-end.
Almost certainly a candidate for test merge.
Assembly/Disassembly instructions are noticeably sporadic, largely due
to our current lack of a unified framework. That's a future thing I'd
like to attack so that it can be handled programmatically, but for now I
only targeted the biggest culprits as I came across them.
---------
Signed-off-by: Batrachophreno <Batrochophreno@gmail.com>
In an effort to make the way our sprites are organized make a little bit
more sense, this takes ALL the sprites in `icons/clothing` and moves
them over `icons/obj/item/clothing` or another appropriate file in the
case of non-clothing items.
A lot of these files had to be split since they lumped everything into
the same dmi which had to be changed since people, reasonably, expect to
find a hat in the folder named `hat` and not in the one where we're
supposed to keep uniforms in.
A lot of smaller files were also merged into already existing dmis where
it made sense.
Lastly, all the colourable items kept in `icons/obj/item/clothing` were
updated to the new palette. Those items were:
**Backpacks:**
- GD Sacred Icon
**Belts:**
- Fannypack
**Gloves:**
- Gloves
- Single Glove
**Hats:**
- GD Cowl
- GD Cube Hood
- Furred Crown
- Surgeon Cap
- Kippah
- Plain Hood
**Shoes:**
- Konyanger Gomusin
**Coats:**
- GD Eccentric Coat
**Uniforms:**
- Colourable Dress
- Shortsleeve Dress
- Evening Gown
- Open Shoulder Dress
- Assymetric Dress
- Tea Dress
- Long Sleeve Dress
- Colourable Scrubs
- Colourable Jumpsuit
this PR fixes wallets and lanyards having a stray mob overlay and cleans
up the code a bit.
tested and made sure that ID cards still appear when worn by themselves
and that lanyards still appear with or without an ID card inside.
fixes#18678. fixes#20926.
this PR fixes some typos and increases the S'rendarr's Hand content in
the adhomian cigarette from 5 to 10 to match the total amount found in
other cigarettes. also removes "vanilla cigarettes" from the code
because it isn't used anywhere.
Stingers are, in my opinion, one of if not the single most lethal
grenade type in our codebase.
They are a LTL option.
Considering they're also standard armoury equiment, I think it's fair to
bring them down a little. Hopefully they'll see more use.
Currently, the Custodial Supplies Locator app provided X and Y coords of
every single mop, bucket, janicart, and cleanbot on the entire server.
This PR makes it so that these objects will only be registered to the
global list of custodial supplies if they are present on the Horizon on
init, and it will also provide Z coords so you can tell if they're on a
different deck.
The app also has a weird built-in GPS function that tracks the reader's
movements instead of the device's. Instead of fixing this to follow the
device, I just removed GPS feedback text- a Janitor can grab one of the
GPS units that comes in their lockers, and this also allows them to be
tracked by other units.
This implements a bunch of little QoL improvements and a few substantial
expansions in hydroponics intended to deepen the job's interactions with
hydroponics mechanics.
- Adds k'ois spores to hydroponics! Note these are only available in
hydroponics proper, the seed storage machine for the garden has been
split into a separate subtype that does not contain k'ois. This is
packaged with a small hazardous containment chamber to safely grow
dangerous crops, in addition to a decontamination area and a hazmat
closet. K'ois is something the kitchen is continually in demand of, and
it is the sole foodstuff of an entire species - I don't see why
hydroponics wouldn't be able to grow it.
- D1 hydroponics now has the same atmos equipment for changing the
temperature of trays as xenobotany, allowing you to take air from distro
and change its temperature across two separate reservoirs feeding into
trays. Different crops grow optimally at different temperatures, this
lets hydroponicists engage with this mechanic.
- A bunch of misc code QoL changes, including shifting the crates in
hydroponics from mapping to code.
- Makes empty first-aid kits spawn with a minimum of 16 storage space.
Previously, the storage you'd see in empty first aid kits was well, well
below how much actual first-aid kits with prefilled contents had.
- Expanded hydroponicist maintenance access a little, so they can now
access the garden and hangars through adjacent maints.
- Seed storage machines have cranberry seeds now.
- A few more items are in the biogenerator, in the interest of making
the hydroponicist a better generalist.
- Shifted around some of the contents of the biogenerator to prioritise
more important stuff, including moving flags to the bottom of the list.
The only item actually removed is the money bag - I'm not sure what use
you'd find for that.
- Adds autoinjectors and autoinhalers to the hydroponicist's herbalism
crate.
Adds a forearm crutch to the game, as well as the ability to select a
pair of crutches in the loadout.
The sprites for it are made by Plyushsune, and altered by me.
## About The Pull Request
OpenDream is adding `usr` and `args` to the `SoftReservedKeyword`
pragma: https://github.com/OpenDreamProject/OpenDream/pull/2307
This PR renames `var/usr` to `var/user` and `var/args` to
`var/arguments`.
## Why It's Good For The Game
This pragma is currently set as an error on Aurora, because using
internal var names for declared var names is cringe.
From the feedback I've been seeing while playing, the bar has become
*unfun* to play or to interact with. I don't think the scarcity PR has
helped improve player experience, at least for the bar. I've re-added
the drinks that were removed, including the cabinet of beer yokes in the
back.
HOWEVER. There are less of all of them, encouraging resupplies if
there's heavy use.
!!!! I have not touched any other changes the scarcity PR introduced.
Medbay and Engineering scarcity remain. Anything added to cargo remains
purchasable, and the lavatory vendor still exists. !!!!
Supersedes #20786
Updated balloon alerts with the latest changes from tgstation.
Improvements include a new plane for them, and their duration changes
depending on their length.
Unfortunately, since they were added, they have been abused for really
long text that is difficult to parse in-game (by myself included).
Balloon alerts are useful, but they are not smoking guns and have
limitations due to their lack of persistence. I have clamped down on
their abuse in favor of the standard established by tgstation, [seen
here](https://hackmd.io/0Cvr4hpcTe-KI6SbgfUWtw#balloon_alertballoon_alert_to_viewers).
We lack updated runechat so I will not propose this be a fully
implemented standard at this time, but I have cut down all existing
balloon alerts to size.
Adds a few new recipes to the biogenerator in the interest of making the
hydroponicist more useful, including synthetic blood which I didn't
notice had been removed until now.
Fixes broken handheld icons for horticultural magazines, and introduces
a simple set of handhelds for them.
Fixes dyn cartons being invisible out of the Condimaster.
Adds sounds for watering, weeding, and sampling hydroponics trays, in
addition to a one second timer for weeding and sampling specifically.
Intended to add more feedback to hydroponics work - right now it's very
mute and lacking in visible messages.
Adds a new functionality to hatchets! They can now uproot plants,
killing them instantly, on a two second timer. This is to avoid the
tedious and arthritis inducing process of clicking on a single tray
several times to kill one plant.
Transitioned some tray documentation to DMDocs.
https://github.com/Aurorastation/Aurora.3/issues/18299
Original bug report was for Air Alarms always displaying their wiring
interface when interacted with, even when the maintenance panel was
still closed.
I found a few other objects which also did not correctly check if wires
were accessible before displaying the interface.
There also remains some inconsistency: some objects will always display
the wire interface when clicked on with panel open, but others require
you to have certain tools in hand too (wirecutter, multitool, etc.).
Without them in-hand, they won't give you the wire UI. I'm indifferent
to which option is better, but it should be made consistent. If someone
feels at all strongly about having tools in-hand vs. not to see the
interface, then I can also make that change with whatever the prevailing
opinion is.
- 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.**
This PR does the following changes:
It changes the name of the 'Smoking' tab in the loadout to 'Drugs and
Medicines'
It moves the psychiatric medicines from the Utility tab to this newly
renamed Drugs and Medicines tab
It adds a few basic OTC medicines, the same ones found in the OTC vendor
in the medical lobby (except for dexalin and dylovene)
It adds some legal recreational drugs that can be selected in the
loadout.
IMPORTANT: You will have to re-select items that you previously had in
the Smoking tab, and re-select your psychiatric medication.
This applies a sound to the act of deploying any kind of trap, applies a
sound to falling into a punji trap, and makes people collapse upon
falling into a punji trap. Intended to give more feedback, especially
considering how lethal a punji is.
Adds a bunch of stuff to the bio-generator, remaps the garden and
hydroponics, adds some new magazines, modifies the plushies selection to
include more plushies, adds a few new bounties, and throws the kitchen a
bone by giving them soy sauce on round start.
Most controversial changes are likely to be:
- I removed back access to lower hydroponics for the cook/chef, and
added a windoor and table to discourage them accessing hydroponics.
- I made the garden smaller and made the vending machine now cost money
to get fertilizer and tools. The amount of credits should be fairly
reasonable, allowing most characters to still use the garden without
issue.
---------
Signed-off-by: courierbravo <73250577+courierbravo@users.noreply.github.com>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
As title: mechanics/electricians/tradespeople having their work gloves
tucked into their belts with the rest of their tools is pretty normal.
Tool belt's description says "...for holding various tools _and
equipment_", emphasis mine, so even though they're not strictly 'tools,'
I still think it fits (plus they're some of the only small utility items
not able to be stored in toolbelts apart from various goggles).
For consistency's sake, one could argue that ALL gloves should be able
to be stored in a tool belt if Insulated Gloves can be stored, but
keeping it simple for first PR, am good with whatever.
<img width="125" alt="dreamseeker_Ipg96rH5Bq"
src="https://github.com/user-attachments/assets/9da6e048-a33c-4198-90ee-e47a05fc85a0"
/>
- rscadd: "Streamlines card mechanics. Click on others to deal to them,
yourself to draw. Ctrl-click to draw, Alt-click to shuffle."
- rscadd: "Adds KOTAHI, the shedding type card game fun for the whole
family."
- rscadd: "Tweaks throw sound volume."
- bugfix: "Fixes some runtimes with cards."
- imageadd: "New sprites for playing cards."
Also seperates picking cards into it's own verb, and no more tooltips
when concealed. No more cheating.
(Also changes the throw sound volume, so it doesn't horribly spike the
volume when you're dealing normally)
KOTAHI sprites by CevUI, modified by myself.
This makes nanopaste take about twice as long to apply at a baseline, 2
seconds rather than 0.7, multiplied by five times if the mob you are
applying it to is yourself, reckoning out to 10 seconds to apply it once
to yourself. This also prevents you from applying nanopaste multiple
times at once, so this time limit can't be contravened.
The intention of this is to discourage using nanopaste mid-firefight,
which has been very powerful in the past since it took less than a
second to apply and could be spammed repeatedly to speed that up even
further. I also hope that it'll encourage IPCs to ask for help to apply
nanopaste, involving other people in the repair process, or to simply
use the workshop now that nanopaste is less instantaneous.
Adds a new item to the smoking loadout tab, an empty metal cigarette
case that can hold 14 cigarettes. Intended to be filled up by rolling
people or those who prefer to keep all of their poison-in-a-stick within
a cute, convenient package.
Fixes an issue wherein the in-hand mob sprites would not display for
cigarette packets and cigar cases, they now do so properly. Modified the
north facing sprites so they don't look out of place (appear BEHIND the
player sprite)
Fixes an issue wherein you could place cigars into smaller cigarette
packets, which became relevant because that meant you could stuff the
cigarette case full of oversized cigars. Now you can only hold cigars in
cigar cases, as you should.
Built for modularity, it should be easy for contributors to add their
own cigarette cases design, and to tweak the existing cigar cases code
to allow for the same handling of open icon states, where multiple
closed icon sprites change to one single batch of open icon sprites,
reducing bloat. Courtesy of Geeves.
While currently out of scope of the P-R, this is intended to be improved
later down the line by allowing you to select which kinds of cigarettes
can spawn in the case in addition to allowing it to start empty, kind of
like how lunch boxes work. Was too complex for me to figure out and
would've taken far longer than needed, but is a planned project for the
future.
Given that the pharmacist is given inhalers and autoinhalers to fill
every round with pneumalin, pulmo, dexalin, and whatever, I figured this
might've been an oversight.
Super helpful for Odyssey rounds when all the crew are going down and
medical wants to bring the entire fridge (8 autoinhalers + 2 inhalers +
4-6 small inhaler cartridges AND the bottles)
EDIT: Changed to only inhaler cartridges, not autoinhalers nor inhaler
bases.
