For a robust crafting system, I need a new materials framework.
For a new materials framework, I need to clean up reagents.
To clean up reagents, I need to pare down foods from reagent holders.
To pare down foods from reagent holders, I need to port edibility
components.
To port edibility components, I need to port processing components.
To port processing components, I need to port tool behaviors.
This is all back-end code, no new features or functionality from this.
-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>
Progress on DMDocs. PRing progress so far so there's not one mega PR
later with 1500 affected files.
I want my goddamn highlight text on what all these goddamn procs goddamn
do goddamnit. >:(
No actual code change anywhere in this PR, only comments.
---------
Signed-off-by: Batrachophreno <Batrochophreno@gmail.com>
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>
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.
Fixes#19603Fixes#20558
- bugfix: "Fixes plant bags - now uses storage_slot system, along with
other bag subtypes."
- bugfix: "Borgs can interact with tables again."
- refactor: "Refactors make_exact_fit to be a binary variable."
- refactor: "Refactors storage items to use make_exact_fit instead of
arbitrary max_storage_space values."
- refactor: "Refactors storage items to use defines for storage space."
- bugfix: "Fixes monkey cube boxes having superfluous overlay."
- rscadd: "Updates the progress bar toggle message."
- qol: "Objects that rotated 90 degrees in storage no longer rotate in
storage slots."
<img width="732" alt="dreamseeker_qRVkIlYN78"
src="https://github.com/user-attachments/assets/1226ed22-52c1-4965-a1b4-2290e56a2ab3"
/>
Enabled new opendream pragmas
Fixed some runtime access check operators (`:`) around the codebase (not
all, some are unfixable as they're used in macros)
No player facing changes (hopefully)
Refactored the attack proc signature.
Added signals and components for the attack proc.
Added signals and components for the attackby proc.
Adjusted some leftover attackby procs signatures.
Added grep test to ensure people don't keep adding attack/attackby procs
with the wrong signature.
Refactored hitby to be in line with TG's version.
Refactored item weight defines to a more clear naming scheme, also in
line with TG's version.
Refactored how the movement bumps are handled, ported signals to handle
them, in preparation for the movement update.
Fixed disposal hit bouncing the hitting atom on the wall.
Items do not push other items anymore if they are tiny.
Our SSOverlays system is outdated, and is likely the cause of many of
the issues seen in #18895. It has also been linked to a massive server
performance decrease.
This brings an updated system from Baystation, hopefully with speed
increases.
Should be testmerged, ideally with #18895.
---------
Co-authored-by: Cody Brittain <cbrittain10@live.com>
* SDQL2 update
* fix that verb
* cl
* fix that
* toworld
* this is pointless
* update info
* siiiiick..
* vv edit update
* fix that
* fix editing vars
* fix VV
* Port the /TG/ globals controller.
* part 1
* part 2
* oops
* part 3
* Hollow Purple
* sadas
* bsbsdb
* muda na agaki ta
* ids 1-15
* 16-31
* 41-75
* bring me back to how things used to be before i lost it all
* the strength of mayhem
* final touches
* cl
* protect some vars
* update sdql2 to use glob
* stuff?
* forgot that is not defined there
* whoops
* observ
* but it never gets better
* a
---------
Co-authored-by: Matt Atlas <liermattia@gmail.com>
* 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>
* 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>
* 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
* 大佬，來抽煙 (Yakuza Smoking Mechanics)
- rscadd: "You can now offer someone a smoke directly from the packet. Just target the mouth area with an open cigarette packet, like you would yourself."
- rscadd: "You can also offer to light someone else's cigarettes."
* Update code/game/objects/items/weapons/storage/fancy.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
* fixes
* use_check
* oops
---------
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
* circus
* code stuff
* Fixes
* the circus is here
* The funny
* Final touch
* things
* Fixes
* area fix
* More spawn and item fixes
* More fixes
* Fix mind
* changelog
* stuff
* tweaks
* Fixes
* circus
* a
* fixes
* areas
* finally
* changelog
* circus fix
* hidden
* Shuttle fix
* Shuttle fix
* circus
* The circus is here for real
* Fixes
* fixes
* tweak
* Should be fixed
* Area fix
* shuttler
* Forgot some stuff
rscadd: "The cookie snack now contains cookies, like the mint and gum packs. They've also been added to the rations box selection."
rscadd: "Gum packs, mint packs and the cookie snack from the vending machines visibly open when clicked on."
rscadd: "Gum packs, mint packs and the cookie snack can be crumpled up when empty. If you really wanted to, you still can crumple it with things inside, so long as you're in harm intent."
rscadd: "Odd boxes, such as candle boxes, donut boxes, crayon boxes and egg boxes can be folded and unfolded from cardboard sheets."
rscadd: "Donut boxes, egg cartons and cigarette packets visibly open when clicked on. Alt-click to close."
rscadd: "Mints actually have a proper taste description now."
no longer goes "Layla Starr casually pulls out a /obj/item/clothing/mask/smokable/cigarette/rugged from the cigarette packet with their mouth."
Fixes#9294
Surprisingly, doesn't really change that much user-facing side.
For some stupid reason, cigar cases were using a rehash of cigarette packet code for no good reason. So I just made it a parent item, and it works just fine.
also added a tooltip to share the rather obscure feature of putting a cigarette in your mouth.
resprites the tajaran cigarette packets to more accurately match where they come from
-changes how the tajara species handles citizenship in game: you now have to pick one of the three factions, this also enables consular officers for them
-adds a new var to the species: default_citizenship, which citizenship should be the default one for that species, so you can have species that can't get biesel citizenship as their main one
-adds a bunch of loadout options to the tajaran section
-restricts tajara from being necropolis contractors
Adds more bedsheet inhands, because immersion.
Penlight has an inhand now.
Lanterns have new inhands.
Ashtray cigarette extinguish now properly plays the sound.
You can put cigarette butts in cigarette packets
also some more stupid drop sounds
