* Japanese Tourists! Oh, and beef stroganoff, I guess! (#57305)
Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>
* Japanese Tourists! Oh, and beef stroganoff, I guess!
Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>
* Fixes the randomly failing unit test that sometimes happens. (#57266)
* Fixes the randomly failing unit test that sometimes happens.
Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
* Adds tourist robots that order food and drinks from the bar and cafeteria (#57010)
* Adds Tourism Economy
Co-authored-by: Emmanuel S. <emmanuelssr@ gmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
* Adds tourist robots that order food and drinks from the bar and cafeteria
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Emmanuel S. <emmanuelssr@ gmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
* Improves the chem recipe lookup by reducing it's lag and other requested changes from feedback (#57156)
So the recipe lookup is considerably laggier than it was testing locally, someone suggested I paginate the big list so less of it has to load, so that's what I did!
* Improves the chem recipe lookup by reducing it's lag and other requested changes from feedback
Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
* Fixes splashing (#57157)
#57042 reported that bottles aren't splashing people properly, so this fixes that by setting the SplashReagents() function to have a spillable override. (I think the override was added recently, and this isan oversight, since bottles don't spill?)
* Fixes broken bottles not splashing the poor fellow hit by said bottle
Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
* moves gun related icons to guns folder (#57077)
moves ammo icons, projectile icons and hitscan effect icons to guns folder
renames projectile.dmi to ballistic.dmi so its less confusing
moves rcd ammo from ammo.dmi to tools.dmi with the rcd
* moves gun related icons to guns folder
Co-authored-by: Fikou <piotrbryla@onet.pl>
* Fixes reagent chamber and other similair machinery breaking (#57050)
* fixes reagent chamber and other similair machinery breaking
* Removes pointless src. and changes R into holder
* Updates var to be more reflective of what it is
* Fixes reagent chamber and other similair machinery breaking
Co-authored-by: Time-Green <timkoster1@hotmail.com>
* Fermichem part 2.2 Adds new tools, crafts and methods for ghetto chemists to handle the new reaction mechanics. (#56871)
Since reactions now require a bit more involvement from chemists, ghetto chemistry is a bit harder. This seeks to help some of those problems by providing new tools for those without a chem heater/reaction chamber.
Also some of these might be useful for chemists in the lab too!
Here's what you can make:
image
the burners are similar to candles - except they burn their internal reagents. The temperature they heat by is dependant on the flame, fuel and oil burn for a lower amount, ethanol for a higher amount and plasma for the highest amount. They can be put on tables and bonked with beakers for a quick way to heat them (similar to lighters). You'll need to light them with a match or lighter too, though, and can be put out by use in hand.
The thermometer looks like this and gives you temperature readings!
thermom
The pH booklets are the same as before - but you can now craft them by making universal indicator. These are the best way for a ghetto chemist to check their pH, and multiple sheets should be used over a reaction.
The improvised chem heater looks like this, and is a reconfigured space heater, it requires more materials and tools lending itself to a static drug den, but has the best method of adjusting temperature and fighting against exo/endo thermic reactions:
Improv_heater
Finally, the cooling spray lets chemists do the oposite of a lighter on their beaker - cooling the reagents within. In addition, fire extinquishers perform the same function.
In addition ice and universal indicator have been added as reactions.
Co-authored-by: Rohesie <rohesie@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
* Fermichem part 2.2 Adds new tools, crafts and methods for ghetto chemists to handle the new reaction mechanics.
Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
* Minor fermichem fix (#57000)
This fixes the surprise oversight that I didn't realise was in. Since syringes can hold explosive chemicals when below 100K you can inject the contents into a person, which will then heat up the reagents from bodytemp.
* Minor fermichem fix
Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
* Fixes reaction chambers eatting beakers, and lets users eject beakers when out of power with alt. (#56944)
Due to an oversight, beakers are eatten on deconstruct, which shouldn't happen. Also allows beakers to be alt clicked out of them to be in line with the dispenser.
* Fixes reaction chambers eatting beakers, and lets users eject beakers when out of power with alt.
Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
* Refactors equilibrium to use as anything and fixes lag compensation discharging (#56940)
I saw that the requirements were updated, so I figured I'd better fix my code to meet standards.
Also I forgot a - in the lag compensator so presently putting the server under heavy lag makes reactions twice as fast.
* Refactors equilibrium to use as anything and fixes lag compensation discharging
Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
* Stop plants from creating xenomicrobes, nanomachines and tuberculosis (#56939)
My finger slipped and now these reagents have the equivalent of
can_synth = TRUE so uh that may not be very good
* Stops plants from creating xenomicrobes,nanomachines and tuberculosis
Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com>
* Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included. (#55551)
Converts the effects of the nightmares light eater into a component and a couple elements
Adds some flavor text to the light eater
Makes the effects of the nightmare's light eater dispel if the armblade is destroyed
Probably a net increase in code quality
More flavortext
The nightmare's light eater effect can be dispelled if you are willing to sacrifice the armblade
* Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included.
Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
* Syringe toggle has been replaced with left-click to inject, right-click to draw. You can also now change transfer amount. (#56865)
* Syringe toggle has been replaced with left-click to inject, right-click to draw. You can also now change transfer amount.
Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
* Fixes Cryostylane and Pyrosium reactions to work/be less janky (#56870)
Pyrosium previously would fail to react because the on_reaction() proc would set it's temperature below it's minimum, so it wouldn't get started. This widens the reaction range to work at pretty much all temperatures.
The same was done for Cryo (which I think works anyways?) but makes the reaction less fussy.
Also makes their oxygen reactions instant so I don't break grenades too.
* Fixes Cryostylane and Pyrosium reactions to work/be less janky
Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
* Refactor can_inject, and introduce try_inject (#56816)
Splits can_inject into can_inject and try_inject. The latter can perform side effects, while the former cannot. Moved the show_error bool parameter to a flag that try_inject checks.
Changes the signature to can_inject(mob/user, target_zone, injection_flags). This was previously redefined in several places, making it impossible to use named parameters. This refactor now allows named parameters to be used, and thus avoiding the ugliness of TRUE, FALSE, FALSE in parameters.
* Refactor can_inject, and introduce try_inject
Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
* Tweak goldschlager to be more complex (gold, girls) (#56419)
Goldschlager contains real gold flakes in the real world, and in-game
it's made from 10u vodka and 1u gold, so it should have some effects of
gold.
The existing descriptions describe it being enjoyed by teenage girls, so
that is now mechanically enforced.
* Tweak goldschlager to be more complex (gold, girls)
Co-authored-by: coiax <yellowbounder@gmail.com>
* Updates Bronze to be a lot better, fixes bugs and allows it to be used on grilles. (#56696)
* Updates Bronze to be a lot better, fixes bugs and allows it to be used on grilles.
Co-authored-by: CRITAWAKETS <sebastienracicot@hotmail.com>
* Add blended dust warning to grinder beakers (#56759)
* Add blended dust warning to grinder beakers
🆑 coiax
tweak: All beakers, bottles and containers that have been used in the
All-in-One Grinder will have a warning not to inhale the dust on
examine.
/🆑
The initial spawned beakers in the grinder already had this description,
and now it is applied to any beakers that have been used for grinding
purposes (and only grinding purposes).
Co-authored-by: cacogen <25089914+cacogen@ users.noreply.github.com>
* Add blended dust warning to grinder beakers
Co-authored-by: coiax <yellowbounder@gmail.com>
Co-authored-by: cacogen <25089914+cacogen@ users.noreply.github.com>
* Refactors plane masters a bit and introduces plane master controllers (#56717)
* plane master controllers
* small adjustments
* bro its a comment CHILL OUT
* powerful
* Refactors plane masters a bit and introduces plane master controllers
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
* repaths plasteel tiles to iron
* Update robot_modules.dm
* a
* fuck me
Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
* Double definition cleanup in reagent code (#56678)
Blood and holywater had a on_hydroponics_apply defined twice.
* Double definition cleanup on reagents
Co-authored-by: NightRed <nightred@gmail.com>
* renames metal sheets to iron sheets
* Merge branch 'master' into upstream-merge-56643
* yay metal
* Update DeltaStation2_skyrat.dmm
* a
* Update CentCom_skyrat_z2.dmm
* a
* a
Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
