This repository was archived by the owner on May 22, 2025. It is now read-only.
adds berry juice to soda dispenser allowing bartender to make more drinks without the minor chance botany grows berries #12643
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Funny healing drinks |
JamieD1
approved these changes
Nov 14, 2021
Yogbot-13
added a commit
that referenced
this pull request
Nov 14, 2021
patpol4
pushed a commit
that referenced
this pull request
Nov 17, 2021
* Bridges the pod * area fixes * fixes AI being exposed * Squashed commit of the following: commit 91097e5 Author: Yogbot-13 <admin@yogstation.net> Date: Mon Nov 15 04:57:29 2021 -0500 Automatic changelog generation #12668 [ci skip] commit e264a66 Author: Theos <theubernyan@gmail.com> Date: Mon Nov 15 04:57:27 2021 -0500 Update datumvars.dm (#12668) commit 85cd07f Author: Yogbot-13 <admin@yogstation.net> Date: Mon Nov 15 03:43:19 2021 -0500 Automatic changelog generation #12666 [ci skip] commit cbf8aca Author: nmajask <nmajask@gmail.com> Date: Mon Nov 15 03:43:17 2021 -0500 Should fix head modular consoles missing some programs (#12666) * *scream why cant I code * Why did this not exist originally *scream commit c7f2b73 Author: nmajask <nmajask@gmail.com> Date: Mon Nov 15 03:32:00 2021 -0500 Update AutoChangelog-pr-12627.yml (#12667) aaaa commit 16c5781 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:26:54 2021 -0500 Automatic changelog generation #12651 [ci skip] commit dda496c Author: adamsong <adamsong@users.noreply.github.com> Date: Sun Nov 14 12:26:52 2021 -0600 Fixes bug in admin ticket panel (#12651) commit 89df547 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:26:44 2021 -0500 Automatic changelog generation #12650 [ci skip] commit ec88cfc Author: ynot01 <ynot000001@gmail.com> Date: Sun Nov 14 13:26:42 2021 -0500 clock armor fix (#12650) commit b530715 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:26:28 2021 -0500 Automatic changelog generation #12622 [ci skip] commit 150df7b Author: AlvCyktor <81328245+AlvCyktor@users.noreply.github.com> Date: Sun Nov 14 10:26:26 2021 -0800 Adds hawaiian shirt to the vending machine (#12622) * Adds hawaiian shirt to the vending machine * Update code/modules/vending/clothesmate.dm Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com> commit 3af62cb Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:21:27 2021 -0500 Automatic changelog generation #12646 [ci skip] commit 87106c0 Author: AlvCyktor <81328245+AlvCyktor@users.noreply.github.com> Date: Sun Nov 14 10:21:26 2021 -0800 Adds the poppy pin (#12646) commit 71d4076 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:19:49 2021 -0500 Automatic changelog generation #12644 [ci skip] commit 33b4803 Author: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sun Nov 14 10:19:47 2021 -0800 Update felinid.dm (#12644) commit 8485cbb Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:19:07 2021 -0500 Automatic changelog generation #12643 [ci skip] commit 711733e Author: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sun Nov 14 10:19:05 2021 -0800 Update chem_dispenser.dm (#12643) commit 7be21bc Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:16:15 2021 -0500 Automatic changelog generation #12634 [ci skip] commit e5123ec Author: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Sun Nov 14 10:16:13 2021 -0800 Update holidays.dm (#12634) commit 27857f1 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:15:56 2021 -0500 Automatic changelog generation #12633 [ci skip] commit eb1d89b Author: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Sun Nov 14 10:15:54 2021 -0800 Update holidays.dm (#12633) commit a64ef3b Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:14:34 2021 -0500 Automatic changelog generation #12631 [ci skip] commit d2c8fe6 Author: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Sun Nov 14 10:14:33 2021 -0800 Update holidays.dm (#12631) commit 886cee8 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:14:11 2021 -0500 Automatic changelog generation #12630 [ci skip] commit b3e14b7 Author: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Sun Nov 14 10:14:09 2021 -0800 Update holidays.dm (#12630) commit a1adc40 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:12:44 2021 -0500 Automatic changelog generation #12627 [ci skip] commit 2e554ce Author: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Sun Nov 14 13:12:41 2021 -0500 Update dna.dm (#12627) commit 60b4960 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:12:18 2021 -0500 Automatic changelog generation #12625 [ci skip] commit 815530a Author: Redmoogle <dakotamew@gmail.com> Date: Sun Nov 14 13:12:16 2021 -0500 Changes the recharger sprites slightly and change them to use gradients (#12625) * Changes the sprite a little and uses gradients * Makes the icon update more snappy * removes the unused * Update stationobjs.dmi commit 4847d41 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:08:43 2021 -0500 Automatic changelog generation #12620 [ci skip] commit 17a0585 Author: KillerOrcaCora <82983051+KillerOrcaCora@users.noreply.github.com> Date: Sun Nov 14 13:08:41 2021 -0500 Scientist Skill Cape Update! *Improved* (#12620) * Update skillcapes.dmi * Create Scicape.dmi * Update skillcapes.dmi * Revert "Create Scicape.dmi" This reverts commit d61c13a. * Update skillcapes.dmi * Update skillcapes.dmi * Update neck.dmi commit 958b4a0 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:06:38 2021 -0500 Automatic changelog generation #12616 [ci skip] commit 2c20e62 Author: Theos <theubernyan@gmail.com> Date: Sun Nov 14 13:06:37 2021 -0500 makes generic bleedstacks stack (#12616) commit d2bacbf Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:04:32 2021 -0500 Automatic changelog generation #12612 [ci skip] commit 5facfd1 Author: ynot01 <ynot000001@gmail.com> Date: Sun Nov 14 13:04:30 2021 -0500 taser spit funny (#12612) Co-authored-by: Theos <theubernyan@gmail.com> commit 07370dc Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:03:41 2021 -0500 Automatic changelog generation #12611 [ci skip] commit 1960619 Author: Theos <theubernyan@gmail.com> Date: Sun Nov 14 13:03:39 2021 -0500 Removes overthrow (#12611) * it's gone * adios * this mode sucks * adios * goodbye * gone * it's fiction * Update antagonists.dm * adios * Update ai_laws.dm * it's gone * gone, reduced to atoms commit 3bc9d5c Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:02:09 2021 -0500 Automatic changelog generation #12607 [ci skip] commit 6ad7aa0 Author: Marmio64 <60946370+Marmio64@users.noreply.github.com> Date: Sun Nov 14 12:02:07 2021 -0600 ashwalker - the resin expansion (#12607) * ashwalker resin expansion * resin statue * Update code/modules/reagents/chemistry/recipes/others.dm Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com> * fix? * makes statue look a tiny bit better * resin slightly less dangerous and less rng dependant, fixed statues Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com> commit 1221822 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:01:37 2021 -0500 Automatic changelog generation #12605 [ci skip] commit cfbf1d9 Author: Lucy <lucy@absolucy.moe> Date: Sun Nov 14 13:01:35 2021 -0500 Toilet bong (#12605) * Adds the toilet bong * Update icon after smoking commit 481ab9a Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 12:59:57 2021 -0500 Automatic changelog generation #12601 [ci skip] commit 0d387d6 Author: nmajask <nmajask@gmail.com> Date: Sun Nov 14 12:59:55 2021 -0500 Ports "Makes alarm manager update even while off and fire alarms clear" #4561 (#12601) * Ported "Makes alarm manager update even while off and fire alarms clear" Ported "Makes alarm manager update even while off and fire alarms clear" #4561 by lordScrubling from BeeStation * Forgot this i suck at coding commit af6402c Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 12:58:45 2021 -0500 Automatic changelog generation #12593 [ci skip] commit c6ca1cb Author: AlvCyktor <81328245+AlvCyktor@users.noreply.github.com> Date: Sun Nov 14 09:58:43 2021 -0800 Operation Spaghonut: Commence Spaghetti (#12593) * Adds spaghonut * added recipe and bugifx * fix? * fixes spelling * this should fix the bugs * adds sprite for donuts and also adds jelly spagonut * Update code/modules/food_and_drinks/food/snacks_pastry.dm Co-authored-by: Theos <theubernyan@gmail.com> * Update code/modules/food_and_drinks/food/snacks_pastry.dm Co-authored-by: Theos <theubernyan@gmail.com> Co-authored-by: Theos <theubernyan@gmail.com> commit c9614f6 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 12:57:30 2021 -0500 Automatic changelog generation #12588 [ci skip] commit 702d1ef Author: nmajask <nmajask@gmail.com> Date: Sun Nov 14 12:57:28 2021 -0500 Replaces some consoles with modular computer consoles (#12588) * Added more presets Added more mod console presets for sec, tcomms, cargo, qm, mining, HoP, HoS, CE, RD, and CMO * Adds the consoles presets to the maps * Few tweaks Forgot to change what the tcomms preset had * Tweaked kilo robotics * Made a few more tweaks to kilo * Re-added the outpost cameras instead of the mining preset commit 7b0217f Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 12:57:05 2021 -0500 Automatic changelog generation #12586 [ci skip] commit 456c0ac Author: Gary Lafortune <mom-puter@hotmail.com> Date: Sun Nov 14 11:57:03 2021 -0600 Refactors the Telecomms log browser computer with fancy TGUI UI (#12586) * Refactors the telecomm log computer's GUI Specifically this is the computer that handles showing the radio logs, not the PDA ones. * Adds the darn delete buttons for the log browser Forgot to add these, christ also cleans up the padding & margins for log entries * Resolves all TGUI linter complaints * Makes NTSL runtimes display a bit nicer I could touch this up all day but I got shit to do and hoes to screw * You didn't see that * I hate whitespace linting so much * Adds (mostly pointless) Refresh button to Log Browser * The new Log Browser now respects language comprehension commit b4d4007 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 12:56:32 2021 -0500 Automatic changelog generation #12581 [ci skip] commit bef12c6 Author: ynot01 <ynot000001@gmail.com> Date: Sun Nov 14 12:56:31 2021 -0500 Update nukeop.dm (#12581) * Revert "Squashed commit of the following:" This reverts commit 68ea873. * Area fixes, a little bit of maint loot, pump fixes, removes unbreakable rocks * Catwalks and tile under broken wall * random double wire under a solar panel * fixed random cobweb * renames the doors
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
op change
🆑
rscadd: Added berry juice to soda dispenser
/:cl: