* Adds Strawberry Daiquiri and Miami Vice.
* Fixes the amout returned in the Miami Vice to equal the sum of its parts, and increases the alcohol percentage.
* Adds Strawberry Daiquiri and Miami Vice to the drinks manual.
* Corrects the formatting and alphabetization of manuals.dm entries.
* Rework tastes to allow for synthetic enjoyment.
* Remove duplicate vars.
* Fix taste sorting for strongest taste first.
* Add yuck descriptions for new drinks.
* Add yuck descriptions with a T like there should be.
* 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 beach towels.
* Add basic towel. Attempt absorbency. Add towel names.
* Make towels pick up and spread blood.
Move towel place-on-floor function to beach towels.
* Move amount to base cleanable. Refine towel procs.
* Ensure towel picks up blood.
* Add species sprites and inhands.
* Apply suggestions from code review.
* Fix ussp space ruin.
* Whitespace.
* Prevent picking up blood DNA already on the towel from mobs/items without decal amounts.
* 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 soft drinks to bar secondary goals.
* Thanks, linters!
* Update bar manual to reflect that procurement will accept soft drinks.
* Add drink difficulties to synthetic soft drinks.
Amend bar manual.
* Thanks, linters!
* 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.
Alan