* 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>
Surgery-compatible gown to let patients stay modest. Available in protolathes for plastic, the medidrobe, and pre-spawned in surgery duffel bags - fast equip times onto others. Sprites made by Kroto
* Fixed a type in gauze falling off message (#57047)
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
* Fixed a type in gauze falling off message
Co-authored-by: Dax Dupont <skyemenjou@gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
* improves fire extinguisher code, and makes fire extinguisher water go through machinery, lockers, and crates (#57004)
* improves fire extinguisher code, and makes fire extinguisher water go through machinery, lockers, and crates
Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
* cult construct stuff (#57027)
edits sprites for wizard cult constructs to have more sheen
fixes wizard cult constructs not working
makes soulstone code a bit cleaner i think
makes cult spells use second defines
fixes wraith jaunts being invisible
* cult construct stuff
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>
* Add Loincloths
Adds leather and cloth loincloths, craftable with their namesake materials; also adds a sensor variant in the Autodrobe and Loadout.
* what the fuck
oh no its broken
* feck
changes defines to be correct, fixes female sprites borking, lets you fix your wedgie, and adds cloth crafting. basically fixes everything.
* clown is dead and we have killed him
* bugfixes
* Update jobmanagement.dm
* Update jobmanagement.dm
* thanos snapped clown a little too hard and deleted a comment
* Add a new admin weapon: foam finger that shoots missiles (#57013)
An admin only rocket firing foam finger has been added. There is also
a toy version available from arcades that is just a giant foam finger.
* added a new admeme weapon: foam finger that shoots missiles as requested by boris (now in arcades!)
Co-authored-by: c420-o <76887567+c420-o@users.noreply.github.com>
* Secret panel once again improved (#56766)
Much easier to add to this panel, before with flexboxes it was nearly impossible but stacks are a lot more friendly.
Miscellaneous old garbage I caught:
For some reason, monkey and only monkey button sent a to_chat to the world of your sins. I cut that, that's unacceptable
I accidentally left out species change from my last pr, it's back in.
* Secret panel once again improved
Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
* Fixes overdose_start() not being called on reagents (#57037)
Co-authored-by: Rohesie <rohesie@ gmail.com>
* Fixes overdose_start() not being called on reagents
Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@ gmail.com>
* pAI's with Binary Encryption keys installed can use them (#57033)
* pAI's with Binary Encryption keys installed can use them
Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
* Miasma SM (#54487)
Makes the supermatter crystal consume miasma in the air to power itself. The rate at which it consumes miasma scales with the partial pressure of the miasma and the gas mix of the surrounding air.
Miasma also increases gasmix_power_ratio, but by half as much as is normally standard
* Miasma SM
Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
* New flight potion wing sprites for moths (#56412)
Wing sprites are courtesy of Papaporo Paprito over on Fulpstation!
This PR adds a second sprite for flight potion wings for moths.
A new system is implemented to make this possible, using radial menus.
* New flight potion wing sprites for moths
* Update species.dm
Co-authored-by: Jack7D1 <59462654+Jack7D1@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
* Re-simplifies corpse examination messages. (#57026)
Dead examination messages are just like they were before. If they are revivable, they are simply dead and lifeless. If they are not, their soul is departed. No needless text.
* Re-simplifies corpse examination messages.
Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
* Crafting menu tells you which colour of crayon is needed (#56950)
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
* Crafting menu tells you which colour of crayon is needed
Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.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>
* Fixes Cigarettes being lit in no-oxygen environments (#56911)
This closes#26487 (Issue about cigs working fine in non-oxygenated enviroments) which has been a known bug for years. Everyone knows how EXTREMELY CRITICAL cigarettes are to game balance. Plasmamen being able to smoke in a room with no oxygen? Spessmen smoking in the hard vacuum of space? What is this madness?!?
I must put an end to these OP tactics.
My changes make it so that if a cigarette has either one mole of oxygen in the current atmosphere or is injected with oxygen reagents, then it can be smoked.
I've also made it so "Space" cigarettes can be smoked in space by changing the default starting reagents to include oxygen. The description was also updated to hint that they can be smoked anywhere.
Also I added a has_gas proc to gasmixtures. I have seen a few places in the code where this can be used and once this gets merged, I will be doing a refactor to clean some code involving it. (bonfires, plasmamen code, etc.)
(Note from lemon, if you use this in the supermatter I will eat you)
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>
* Fixes Cigarettes being lit in no-oxygen environments
Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>
* Fixes projectile damage multiplier not applying to stamina damage dealt by projectiles. (#57016)
* Fixes projectile damage multiplier not applying to stamina damage dealt by projectiles.
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
* Build mode fill tool asks for confirmation if filling area is large (#57007)
Prompts admins to confirm their selection with the build mode fill tool if the selected area is over 150 tiles.
I've seen this happen a few times now (to both myself and others), accidentally filling a massive area because they either forgot that the tool was still on or were moved unexpectedly. This should prevent these kinds of mistakes from happening easily.
* Build mode fill tool asks for confirmation if filling area is large
Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.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>
* Mild Blood Rites QoL and Blood Halberd cleanup + sprites (#56924)
Blood Rites now uses a radial menu for choosing which version of the spell you want.
Blood Halberd, now Bloody Halberd, has had some of it's weirdness as a cult weapon resolved by bringing it under the cultblade parent, ensuring it is babyproof and not able to be turned on others by noncultists.
Bloody Halberd now has a new sprite.
Additionally, some code guideline cleanup, as well as making the cult longsword use the x64 sprites I added for the dark blade a while back.
* Mild Blood Rites QoL and Blood Halberd cleanup + sprites
* Update coats.dm
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
* replaces all instances of ammo_casing/BB to loaded_projectile again without crashing this time
* a
Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
* everything but da map
* everything but da map
* Makes it work ~somehow~, I have genuinely no clue why
Stumbled upon the fix by pure luck
* Trailing newline
* . = ..()
* what the fuck?
* this works
* mapping is pain
* why tf is the CI failing, run it again
* hhh
* wack
* Resolves map conflict
* a
* Actually solves the conflict now
* please
* Webedit spacebar to rerun CI
* i swear to fucking god
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
* id console -> modular console
* Rerun CI
* deletes the fucking map
* fixes the merge conflict AGAIN
Co-authored-by: Ranged <nickvanderkroon@gmail.com>
* Fix small oversight with a query deletion (#56997)
Just a tiny bug that can make a lot of screaming! "Undeleted SQL Query"
* Fixes a small SQL qdel being missing
Co-authored-by: Funce <funce.973@gmail.com>
SkyratBot