* mining voucher tweak
* will it blend
* d
* s
* ss
* advanced fire extinuishers
* remove trash
* garbage cleaning
* lets see
* t
* whatever
* test if using a var compiles
* adds it to cargo
* adds to atmos + ce
* should fix the sprites
* lowers the volume of the foam tank
* gonna load the icon for this soon
* woops
* foam icon
* ddd
* it works
* boo
* r34ijfirgv5
* Adds a new drink: Peppermint Patty from Archer! (#38427)
* Sprites!
* S_______ W________
* Candyland snuck into pr... Check!
* removal of candyland extract
* candyland but not the sprites yet.
* fixes :)
* Whoops, lets fix that too
* Adds a new drink: Peppermint Patty from Archer!
* You can see what other people eat or drink (#38395)
* Makes drinking message visible to others
* Makes swallow message visible to other people
* Adds visible messages for eating
* Update snacks.dm
* Update snacks.dm
* Update objs.dm
* Update drinkingglass.dm
* Update pen.dm
* Update drinkingglass.dm
* Update drinkingglass.dm
* Update drinkingglass.dm
* Update drinks.dm
* Update condiment.dm
* Update snacks.dm
* Adds a few extra reagents to the borg shaker
* Update drinkingglass.dm
* Update drinkingglass.dm
* removes blood as a borg shaker reagent
* You can see what other people eat or drink
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
