### 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.
**JUST BECAUSE IT SAYS "DELETED" IN ICONDIFFBOT DOESN'T MEAN IT'S BEEN
REMOVED. IT CAN BE RENAMED OR MOVED SOMEWHERE ELSE. PLEASE STOP
SPREADING MISINFORMATION THAT I'M DELETING EVERYTHING. JESUS CHRIST.**
- **The only hats removed are from budg's hat bloat (except the newsboy
hat, which has been touched up)**
- Human origin lore hats have been moved to Human - Xenowear. **NOT
REMOVED. MOVED.**
(It was kind of strange anyway they got special treatment. They aren't
restricted in any way, though, so essentially no difference.)
- Vysokan hats all rolled together into one selection.
- Beanies rolled into one selection.
- Miscellaneous, colorable hats rolled into one selection.
- Miscallaneous hats rolled into one selection.
- Dominian consular clothing items moved to be jobspawn items, like
every other consular. (Alt uniform outfits should be out from the
loadout anyway.)
- Pilotka caps, and whatever else they're called are all now named as
sidecaps.
- Renamed the Visegradi Nyakas to ear-flap cap. (I understand the
sentiment of blending lore into stuff, but putting it in the name isn't
helpful. I tried looking up Nyakas and all I'm getting is an obscure
brand of wine.) (Description unchanged.)
- Renamed padded cap to tanker cap.
- Bucket hats rolled together into one selection. (Removed pre-colored
boonies because it's just a clone of recolorabled ones.)
- And anything else I can't remember.
**Please don't spread misinformation after me and send the goon squad
after me.**
**Please just fucking message me and ask. Oh my god.**
---------
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Removes the fruits from taking up valuable space in the produce boxes.
Pastries and cakes are pretty much a luxury item for the most part - and
it isn't too hard to grow them in the minor amounts that they're
actually needed in recipes.
Moves rice from the produce box to just normal-ass bags beside flour.
They're basically as important as flour at this point.
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>
Resolves several missing icon states for some random/ objects and traps.
Nothing user-facing, just makes them appear properly in StrongDMM.
Deleted several sprites we weren't using from punji.dmi.
-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>
- TCAF Corvette given GPS tags and posters for recruitment
- In process ballooned into major poster refactoring, replacing global
list with singletons and adding defined poster subtypes for mappers
- All defined posters switched to subtype equivalent
Held of on placing any posters in Horizon, as that would be best for a
seperate PR if I ever do that
We also might need better names for some of these posters.
---------
Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
Don't let the large file size scare you, it's just mostly splitting
stuff into contained sprites and putting them in the correct place.
Anyway, resprites most non-resprited devices in devices.dmi, and puts
them in contained sprites.
Also puts any related /obj/item/device into contained sprites too.
That's basically the long and short of it.
Adds more drugs (in more varieties) to the maintenance tunnels,
including:
"Smart Pills"
All the cocaine variants, as opposed to just two (available in
individual pills and pill bottles)
Joy (available as a pill and a bottle)
Heroin pill bottle and syringe (not autoinjector, normal syringe)
Krok Juice as an autoinjector
Snowflake as an autoinjector
Raskara dust as a normal syringe and as an inhaler
Pills and pill bottles were also moved into a further random contraband
subtype to make it a little less common to find them and keep the loot
spawns more diverse
i wanted to add red nightshade but the last PR that tried got told to
remove it 😔
Certain law modules swapped from AI Upload into vault loot pool
Some modules added to AI Upload (such as safeguard, tried to do modules
that are dangerous but SCC can imagine a reason to enact it)
Adjusted random law board options and weights
Increased vault loot pool slightly, with additional weapons, rig module,
and law board
---------
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
Added new sprites for random objects for everything in random/clothing,
/food, /loot, /medical, and /misc.
Also got distracted and changed how the corn oil/cooking oil tank looks
and how much reagent it holds. Now looks like the rest of the reagent
tanks and holds the same amount of liquid, 1000u.
This PR brings back the more accurate title for First Responders, of
Paramedic, to bring it in line with some snippets of the SOP and to be
more accurate to the role itself, as both Security Officers and the rare
and elusive Firefighting Atmospherics Technician can be considered first
responders.
also I just like it better.
Changes any mentions of first responder in gear/access/etc to Paramedic
or PARAMEDIC where applicable.
* Added power cores, a type of large battery cell that get used by
exosuits. The nuclear and phoron variants are self-charging.
* Combat mechs now start with nuclear power cores, allowing them to
sustain themselves indefinitely, so long as they stay out of the action
for a bit.
* Removed basic power cells from the mechfab, replaced with the mech
powercores.
* Mech cell statuses now instantly update as soon as the cell charges or
discharges.
* Added a stack of 10 uranium to the machinist's workshop, which can
print two nuclear power cores.
This PR does the following.
- Removes Heroin, Cocaine (and it's subtypes), Raskara dust, and all
other Tier-1 drugs in our drug list (excpet from the Cargo reagent
spawner.
- Adds more contraband to the contraband loot table. For example -
- Cocaine, Heroin, 9mm pistol, derringer revolver, sawn off shotgun
(improvised), paralysis pen, and the poison pen. I also added auto
injectors for drugs that are not in pill form, like imprednezene(?),
stimpack, beserk, and nightlife.
- Adds more contraband map spawns in maintenance areas. I believe it
adds 5 or 6 across all three z-levels in areas like the abandoned bar,
the poker table, a table in maintenance by science, the maintenance
under the bar, etc. The map diff bot will show. These are not always
guaranteed to spawn either upon my testing. I'm not sure why, but it
works better this way imo.
- Removes ambrosia and other non-contraband drugs from the loot table
for now.
If requested, I am open to adding one or two custom contraband spawners
for the brig. Just ask in the PR's comments.
---------
Signed-off-by: Avery Marie <98699252+Eyeveri@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Adds several pre-contact Unathi gun designs, some of which currently
accessible through antag gear crates and the Unathi pirate ghost ships.
All gun sprites done by Gecko.
Additionally buffs the generic Unathi armor and Hegemony armor to be
more on par with standard plate carriers instead of just being good at
melee and terrible at everything else, as well as respriting the generic
armor and rewriting flavor text. Armor resprites done by Dronz.
This is part 1 of a project to, eventually, bring the render planes
system from /tg/ and bay into Aurora. This is a prerequisite and blocker
for many things the development team and community want to have, and
this was long overdue.
Many objects have been re-assigned layers, which are now thoroughly
defined. Maps have had their custom layer defines purged, as we should
be moving away from this in favor of saner definitions in the base
items.
This should be a test-merge due to the sheer amount of layers changed,
which will very likely create issues that I cannot possibly discover and
debug in a reasonable amount of time myself.
---------
Co-authored-by: Cody Brittain <cbrittain10@live.com>
* 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.
* a
* j
* o
* 21
* we are so back
* i
* o
* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
* 447534575478u564u8
* areas
* air alarms
* AIRLOCKS
* a
* h
* c
* cc
* 6
* tests rerun please
* k
* 8
* a
* 756832
* 6845783578
* 85864354632463
* 2
* kills geeves
* a
* tests rerun please
---------
Co-authored-by: DreamySkrell <>
* 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>
* balls
* lint this
* lint deez
* le change
* Update stinger.dm
* i am going to murder the new linter
* sprite
* Update CampinKiller24-ready-or-not.yml
* 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
* The Pumped Up Kicks Update
Shoes. New shoes. Look at them.
* WELCOME TO THE UNDERGROUND
* for the love of crust
* turns out a var already existed for that but was never implemented ffs
* face it you're never going to make it
* these are winter boots
* removes Paradox's Thinly Veiled Fetish
* shiit
* Apply suggestions from code review
* Update code/modules/clothing/shoes/oxfords.dm
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
* oops
* fuck this file
* nice balls, bro
* check out how hard i can pee
* pissing on the moon
* caligaeae
* pee pee poo poo man
* fixes
* damn you
* merge fixes
* knees more
* damn you merge conflict
* fix
* fixes 2
* riding boots
* truly, this fixes things
* dammit ctrl s
---------
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
* Frontier Cowboys now receive a level action rifle
* Icon and sounds for the Lever Action
* CL
* Attribution
* Added updated sprites by suethecake
* Ensure internal consistency
* after dark
* FIXES
* breakin
* butt
* Update code/game/objects/items/devices/floor_painter.dm
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
* Update code/game/objects/items/devices/floor_painter.dm
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
* Update code/game/objects/structures/lattice.dm
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
* testing 1
* a
* FUCK THIS PRESET!!!
* allah
* OTEMACHI
* tis' done
* Project Exorcism : Sneed's Snairs (Formerly Chuck's)
* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm
* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm
* Update stools.dm
* Update code/game/objects/structures/stool_bed_chair_nest/stools.dm
* Update code/game/objects/structures/stool_bed_chair_nest/stools.dm
* Update stools.dm
* Update chairs.dm
* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm
* inhand fixes
* airlocks (matt has cooked)
fuck
* my cody plays the mamba
* fuck
* fixes layering issue
* airlocks and everything else Please fucking kill me
* underlays
* unfuck blending
* finished replacing old ass shit
* your ass is geass
* conflicts die now
* public fat'wa
* progress on walls and windows
* more mapping
* baltimore accents be like
* minor progress
* monitors
* fire alarms and apc adjustments
* apcs pixel adjustments, final airlock look
* also grilles
* shuttle wall start plus shuttle windows
* starting consoles
* table outlines
* I love broke ass sprites
* fixing the stupid ass exterior walls
* light fuckery
* terminal directionals, external airlocks, table fixes, blahblahblah
* fix 1
* fix 2
* some more fixes
* fix chairs
* basic untested railings and updating colors from atteria
* bridge and some fixes
* removing some artifacts on the new walls
* breaking wood tables and adding 4 wall materials
* fix
* compile & wood fixes
* make the horizon compile again
* railings, firedoors, ATMs, intercomms and tables again
* mapping begins also some tweaks to map view of icons
* full tile steel walls
* i sure hope nothing bad happens
* airlock updates (untested)
* reverts most wall machinery
* skull
* wall coloring
* makes the tg wood chill out
* work on airlocks
* hull consistency
* cause you live forever in the lights you make
* whoops can't show that in a christian manga
* terminals should be on walls and everything's hunky dory now
also i changed the wood stuff as per atteria's suggestion
* fixing airlocks
* fixes
* window resprite, coloring adjustments
* scc hull resprite
* new grilles, frame edits, and borosilicate
* greyscale wood palette improvement
* shuttle windows
* window frame fix
* apc update
* refit and reshaded fire alarms
* mapping icon fixes
* table fixes
* map fixes, platforms and stairs
* updates cutter, new walls and terminals
* mapping fixes
* fix preview
* preview fix stone
* stairs
* initial work for the map
* railing and windowpane fuckery
* new external airlocks
* a
* fix the maps in preparation
* wall object pixel offsets
* air alarms D1
* extinguisher cabinets
* APC DESTROYED MISSION ACCOMPLISHED GOOD WORK
* deck 3: floor decals, APCs, air alarms, fire extinguisher cabinets
* deck 3: fireaxe cabinet
* /shuttle_landmark/distress/blue, move base_turf from map to obj def
* intercom presets
* formatting
* deck 1: floor decals
* deck 2: named area fix (LMAO), signs to use single quotes
* deck 2: floor decals, APCs, air alarms, fire extinguisher cabinets, fireaxe cabinets
* Platforms and stairs!
* grates and bugfixes
* Angled ship walls + grate color fix
* corrects apc anim overlay
* deck 2 and away site fixes
# Conflicts:
# maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
* deck 2 missing grate
* warning stripes
* railings and ledges
* windows and fixtures
* windoorsagain
* airlocks pt1
* windows de-seamed and transparent
* airlocks and pixel offsets
* fixes for airlocks
* more airlock fixes
* presets for ringer, request console and newscaster
* 132
* asfsaf
* kitchen tiling
* thicker freezer tile bevels
* More angled walls
* New shutters and blast doors
* directional corrections
* ops railing fixes
* updated window map things and shutters
* value changes and blast door changes
* Ledges and platforms galore (D2/D3)
* all decks: fix door dirs
* all decks: newscasters, intercoms, requests consoles, ringer consoles
* helm light blue decals to dark blue
* supermatter door dir fix
* fix directional presets (dirs/offsets): newscaster, intercom, requests console, ringer console
* firedoor changes
* deck 3: overlapping wall mountables fixes
* map changes
* airlock changes
* map tweaks
* airlock & stair icons
* various mapping modifications
* Double airlocks + fixing denied states + fixing airlocks on all levels
* Rebase
* directional terminals buttons and lights again, platform tweaks
terminal north facing sprites, atm/food terminal directionals
proper door control and lightswitch directionals (presets still need to be set up, mapping)
re-adds new light tube sprites, again
new sprites for floor lights and the other stuff that got added
adjusted platforms to be recolorable, added light and dark versions, fixed some shading
* missing ERT outfit thingy fix
* floor lights fixed
* deck 3: various small fixes
* deck 1: various small fixes
* deck 2: various small fixes
* fixes
* d2 fixes & multitile door fix
* d2 fixes, remove unused airlock files, button icon fixes, window icon fixes
* make it actually compile, oops!
* make it actually compile, pt2
* CE office camera
* pew pew pew
* pew pew pew 2
* fixes
* deck 3: buttons fixes
* deck 3: button and other fixes
* deck 3: fixes and stuff
* D1 fixes & skrell airlocks
* minor D2 tweaks
* a lot of airlock-related fixes, glass tables, paint sprayer fixes, decal fixes, changelog
* maintenance hatch sprites
* fixing double doors
* flips multi-tiles, fixes multi-tiles, adds desk windoors
* new plastic flaps
* deck 2: a few buttons
* side + middle doors
* created paths for 3-tiles doors
* apply to map the 3 tiles airlocks
* some fixes, windoor alpha
* remove this random ass potted plant
* more map fixes
* holodeck disposal pipe fix
* secure airlock sprites
no code or obj definitions yet
* vault airlock
* vault door fixes
* scc window alpha
* adjusts double door glass, firedoor open state
* adjusts construction states for doors
* remove some defunct icons and fix anims
* assembly stuff
* pharma fixes
* vault door dir
* firedoor smart generation moved to its own proc
* lift doors, d1 fixes
* firedoor smart generation: adjacent wall check
* firedoor smart generation: adjacent firedoor check
* all decks: missing firedoor and other fixes
* deck 2: weird maint stairs fix
* oops
* diona airlock fix
* the shuttle wall gigadeath
* fixes
* some fixes for leftover map item paths, and double lattices
* new diona walls
* more fixes
* and more
* deck 1: fix out of bounds keys
* deck 3: fix out of bounds keys
* runtime 3: duplicate APCs fix
* all decks: make all 3 tile wide doors glass
---------
Co-authored-by: Wezzy <wowzewow@gmail.com>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
Co-authored-by: kyres1 <noodle.buster31@gmail.com>
Co-authored-by: Matt Atlas <liermattia@gmail.com>
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>
Co-authored-by: naut <nautilussplat@gmail.com>
Co-authored-by: naut <55491249+nauticall@users.noreply.github.com>
