* Progress
* Forgot a comment and 2 numbers
* Sprites here
* Should be finishing touches
* Forgot an output and to specify cooking
* Give the ashies a bowl, and fix a few things
* Forgot the ability to cook pre-crafted raw kebabs into cooked
* Forgot the steps needed to be a list
* Ash Salad should be fireproof
---------
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* Add drinks and recipes from Hispania!
* Fix duplicate var in bottle.dm. Thanks, linters!
* Add fitness cups to stations, BSH loot.
* Dull some glass rims that don't need to be quite that bright.
* Import several foods and recipes from Hispania!
* Fix trailing newlines, remove hispania icon reference.
* Fix list spacing, add drink reagents, correct annona spelling.
* Amend drink description, move icons
* Apply new timer from @CRUNCH-Borg
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
* Apply @CRUNCH-Borg's attack chain suggestions
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
* Fix many duplicate vars.
* Fix more duplicate vars.
* Remove duplicate toast.
* Fix unreachable callback. Now with @CRUNCH-Borg!
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
* Amend some icons.
* Add vendor seeds, tweak plant sprites.
- Add base seeds to MegaSeed Servitor.
- Change smoked salmon sushi to use smoked salmon instead of salmon steak.
- Make maize dough yellower.
- Fix capitalization in peyote description.
- Make coconut inedible.
- Modify cream cheese recipe to remove conflict with butter.
- Tweak sprites of growing plants to sit inside hydroponics trays and not move around so much.
* Add guacamole recipe, agave distill reagent.
- Add prep bowl recipe for guacamole, condiment container and icons.
- Change cactus salad icon to use new plastic cup shape.
- Add distill reagent "tequila" to agave.
- Make coconuts only attack on harm intent.
- Fix some whitespace.
* Prevent bombonuts from detonating instantly.
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
* Spellcheck.
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
* Change some item names, descriptions, recipes.
- Make custom robot head recipe step so that those recipes don't just call for "a head".
- Replace smoked salmon sushi ingredient with new smoked salmon.
- Fix some confusing item names.
- Update descriptions of cacti.
- Add raw mouse as mouse butchering result.
* Modify reagent colors. Make cream cheese bread with cream cheese.
* Adjust some recipes and descriptions.
- Remove hipster ridicule from mate. Add it as a reagent to the plant.
- Touch up some grammar.
- Amend recipe for sweet arepas.
* Fix grown food slicing debug message.
* Grammar improvements feat. CRUNCH
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
---------
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Add juice boxes.
- Include juice boxes in packed lunches quirk.
- Make juice names and drink names in drinks_reagents.dm more consistent.
* Appease linters with static typing?
* Add juice box box. It's a variety pack.
* Add trailing commas to positive quirks as requested.
* Add random juice box spawners.
- Spawn random and specified juice boxes on station maps.
- Spawn partial juice variety packs on station maps.
* Add juice box variety pack supply crate.
* Make juice box storage even fancier.
* Thanks, linters!
* Thanks, linters! part 2
* Give the pre-packaged juice boxes a brand name.
* Apply whitespace suggestion from review.
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
---------
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* dmi time
* .dmi stuff done, maybe
* Created cannibalism.dm and moved KFV's obj stuff.
* Update cannibalism.dm
* Wild Wings and Bug Bar
* A few more.
* Meow Mein
* Lead and Plasma-Bone Broth
* Multiple possible sprites.
* Last food item. Next recipes and the Bone Rod.
* Adding bone rod sprites and sprites for bone rod variants of food with metal rods in them
* Fix complaining of the compiler.
* Bone Rods
* Almost everything done.
* Bone Rods ticked.
* dme updated on compile.
* Forgor the BBQ variant of Moffolo Wings needed a unique path.
* Probably make Plasma-Bone Broth flammable like plasma sheets.
* Should light now, will test later.
* Some recipes, and processor.
* Processor was complaining, also changed a parameter to be readable.
* More bone rod.
* The rest of them.
* No more errors on compile.
* Recipes tested and things fixed.
* Lead works.
* Kidneys dead? Toxin.
* Soy Sauce in the Meow Mein.
* Working sprite RNG.
* Make Linters happy
* Apply suggestions from CRUNCH's code review to fix Plasma-Bone Broth's flame.
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
* Make linters happy
* Updated bone rod description to be less vague.
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
* More descriptive recipe names in code
* Replace Meow Mein sprites with Feline Mignon
I'll see about using the Meow Mein sprite for chef craftable Chow Mein, as the issue is with Meow Mein not the sprite.
* Change code from Meow Mein to Feline Mignon
* Don't need the blank recipe list in this PR.
* Update code/game/objects/items/stacks/bone_rods.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/objects/items/stacks/bone_rods.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Add 23 new drinks; update bar manual.
- Add three new drinks that use the beet shrub and their effects
- Add nine new synthanolic drinks and their effects
- Add two new soft drinks for both synthetic and organic customers, and their effects
- Add 10 new soft drinks for synthetic customers and their effects
- Add decals for reagent splashes and drips
- Update bar manual to include these drinks as well as all other mixed drinks currently on the wiki
- Add new sprite for welding fuel in a glass to reflect the liquid's color instead of Dr. Gibb
- Add chemistry recipes to mix electrolytes
- Change Robot Tears' drink difficulty to easy, to reflect the loss of ubiquitous oil tanks
- Add many, many puns, both visual and in written text
* Thanks, linters!
* Thanks, linters! (part 2)
* Thanks, linters! (part 3)
* Incorporate review suggestions.
- Add reagents to the zero day drips
- Rewrite many if statements to be early returns/continues
- Use nutrition defines
- Make hard and soft reset also purge themselves (my choice)
* Update dryer martini sprite to match proposal #31050
* Incorporate review suggestions.
- Remove reagents, weren't needed.
- Make sure basecolor is applied.
- Convert more if-blocks to early returns.
- Adjust spacing in function calls to match standard.
* Implement whitespace suggestions from review.
* Handle runtimes during the Initialize chain in InitAtom and the admin atom spawn verb
InitAtom now qdeletes any atom with an unhandled exception in Initialise. This ensures no broken atoms become visible to players. This allows atoms to safely throw inside Initialise to signal something being very wrong. Before this they had to continue running to return INITIALIZE_HINT_QDEL.
* introduce system for catching accidental spawning of base type atoms
atom/Initialize checks if the description is the sentinel value defined in ABSTRACT_BASE_TYPE. If it is, it throws an exception. This is advantageous because it logs the callstack and causes InitAtom to immediately qdelete the atom.
* introduce burgers to the system for catching abstract base type spawning
* still spawn items, even when they runtime during Initialize
Quote by Contrabang: "things should never fail to spawn when new'd"
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Kenionatus <kenionatus@techie.com>
* use QDELETED insted of QDELETING in case it already got fully deleted
I don't think it would ever happen, because we still hold a reference with A, but never hurts to be safe.
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Kenionatus <kenionatus@techie.com>
* use stack_trace for consistency with the rest of the codebase and change message
We no longer delete the atom, so the message should reflect that.
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Kenionatus <kenionatus@techie.com>
* remove check for incorrect define
Should be caught in review when that is used.
* remove the test for qdeleting atoms in admin item spawning again
It's practically pointless now that we no longer qdelete spawned base types.
* rename ABSTRACT_BASE_TYPE to ABSTRACT_TYPE_DEC
It's more descriptive. (Hah, pun.)
* restore annihliated newline
---------
Signed-off-by: Kenionatus <kenionatus@techie.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Alan