Adds in a new Bottler machine used to combine a set of three ingredients
into a beverage!
Adds a new line of drinks, branded Paradise Pop, to be made with the
bottler. Currently, the possible flavors are:
- Paradise Punch
- Apple-pocalypse
- Berry Banned
- Blackeye Brew
- Grape Granade
- Meteor Malt
These beverages currently have no mechanical effect, though that will be
added at a later date along with additional recipes
The bottler can dispense empty glass bottles, plastic bottles, or metal
cans as well as fill these containers with the result of a processing of
ingredients. Successful processing requires both careful selection of
ingredients AND proper ordering, or else the entire drink is rendered a
horrible and nigh-undrinkable disaster.
Used cans and bottles, both from the bottler and the vending machines,
can be reinserted for recycling even when crushed, so pick up that can!
Clown stole all your cans and bottles for his latest prank? Simply slide
in some sheets of glass, plastic, or metal to restock the machine's
reserves!
Order your Bottler today from cargo for only 35 supply points, and we'll
even throw in a free wrench to help you move it to its new home! (will
map one into the bar later)
Minor other changes:
Sugarcane and grapes received kitchen_tag values, so they may be used in
the bottler
- Also allows grapes to be properly juiced again in a blender
Water bottles from the vendors now are plastic bottles, instead of glass
* bicon regex run
* Remove all \black
* Goonchat from /vg/ / Goon
Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3
* Fixes and changes n stuff
- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro
* whoops
* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)
* Strip problematic tags from tcomm scripts
- <audio>
- <video>
- <iframe>
- <script>
* Fix human examine icon
* Name hotkey elements
* Removed old stylesheet
Removed special check for plants. Bees undo it all so it's not worth the trouble just yet.
Credit for Crazylemon for being best coder. He helped me find a lot of issues that I would have been too stupid to find myself. Runtimes are gone
Decided to scrap the beekeeping HUD for now. Turned out it's way more complicated that I thought. I'll try it again in the future.
Added the Hydro HUD design for Protolathe. Need to test if it works.
Might have made a mistake in Git so commiting in order to pull from Paradise master to see if anything broke.
Finally got the HUDs to work all thanks to Crazylemon. The only thing that doesn't work is the hudharvest2 is_type_in_list() check I made but I could get rid of it
Everything is done. Except it doesn't work. I must be missing something somewhere but otherwise I did everything that appeared needing to do. Based it off of mech diag HUD so that might be the issue.
Code as of now does not let you join the server. Need to revert bit by bit and find out what I did wrong
Mutated / Modified / Enhanced plants will no longer add new prefixes to
their names resulting in obscenely long names like "mutant mutant mutant
mutant mutant mutant enhanced mutant mutant modified wheat"
- Plants will now simply use a single "mutant", "modified", or
"enhanced" prefix to their name, determined by the last type of
modification used.
- This means you can mutate a modified plant and then pass it off as
merely "enhanced" if you do things in the right order
HAPPY SIDE EFFECT BONUS FUNTIME EXTRAVAGANZA!
- The chef's smartfridge will now compact ALL mutant, modified, or
enhanced versions of a given plant into a single listing.
- No longer will you have 50 listings of mutated wheat (with ever-longer
names) because the botanist decided to raise a couple bees.
Bees also now can not affect hydroponics trays that have their lids up.
- Raise your strange plants in peace, knowing the bees won't make them
stranger unless you want them to.
Premade beeboxes (and the random variant) now have the right kind of
worker bees, instead of the generic "bee" type.
- This was a mistake / oversight on my part from the bee refactor in the
Bee Briefcase PR.
- For reference, the premade (and random) beeboxes are admin spawn /
mapper only. That's why this never was noticed.
Adds 4 new fudge flavors!
Peanut Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, and 3 peanuts
Cherry Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, 3 cherries
Cookies 'n' Cream Fudge:
- Made with 5u milk, 5u sugar, 5u cream, 1 chocolate bar, 1 cookie
Turtle Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, 1 peanut, 1 caramel
Also adjusts the standard fudge recipe
- Now 5u milk, 5u sugar, 1 chocolate bar
- Fixes#4457
- REMINDER: These use chocolate bars made via reaction, not the candy
bars you make / buy from machines
The situation has only been made worse by the addition of yet more bees!
Adds the brand new botanist traitor item: BRIEFCASE FULL OF BEES!
- Just your average briefcase by looks, but don't be fooled, this
briefcase contains Syndicate-bred bees intent on ruining days.
- Botanist-only traitor item, 10 TC
- On use, it actually ANNOUNCES ITSELF to the station with a
station-wide intercomm broadcast of DR. BEES!
- The sound clip has a cooldown. Releasing the bees does not.
- Comes loaded with 10 bees, releasing up to 5 bees per use
- Inject blood into the briefcase to train the bees still inside (not
ones already released) to NOT attack the donor(s)
- There is no way to put bees back into the case, but rumors abound of a
reagent that can replicate syndi-bees. How strange...
Refactors bee code a bit, and makes normal bees less murder-y
- Fixes#4306
Adds new bee type: Syndi-bee
- Never returns home
- Never pollinates
- More health and slightly more damage
- Normal bees: 10 hp, 1 damage. Syndi-bees: 25 hp, 5 damage
- Always injects Flurosulphiric acid into its victims... EVEN THOSE IN
HARDSUITS
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.
Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
A long-requested feature, you can now build the two xenobotany machines
- Lysis-Isolation Centrifuge
- Requires 1 matter bin, 1 scanning module, and 1 console screen
- Upgrading the scanning module causes less degradation when extracting
genes, meaning seeds last longer
- Bioballistic Delivery System
- Requires 1 matter bin, 1 manipulator, and 1 console screen
- Upgrading the manipulator decreases the degradation caused by splicing
genes, meaning you can (theoretically) splice more onto a pack before it
fails
Removes the gene masking from xenobotany in favor of more readable
labels.
- No changes to how things work, just removes the obfuscation that
existed simply to make you push a bunch of buttons before you could do
anything meaningful with them.
Standardized the spelling of "Cocoa", as this was inconsistent
- One spot refers to it as cacao still, but that is because it is in the
legit latin scientific name. Everything else is now cocoa (not coco).
Chocolate now will provide some nutrition (and make you fat if you eat a
lot)
- Cocoa Powder (the arguably main component of chocolate) provided
nutrition, but that nutrition mysteriously vanished when you combine it
with milk and sugar. Now chocolate provides the same nutrition as the
cocoa powder in it
Merged a number of cases where foods had both chocolate and cocoa to now
have just chocolate
- In the case where both were present, the volumes were combined to
maintain food sizes
Renamed cocoa pile to chocolate pile, as this was wrong
- The cocoa pile claimed to be a pure cocoa powder pile, but was
actually just chocolate that was dumped on the floor.
Removed a fair amount of relative pathing, but there's still more to go.
