Commit Graph

2858 Commits

Author SHA1 Message Date
SgtxRootbeer 63d32fb1bd Removes trekchems, adds new catagory 2 chems. cobby-approved. (#45105)
* Add files via upload

* Update Sleeper.dm

* Update borghydro.dm

* Update robot_upgrades.dm

* Update buffs.dm

* Update medbot.dm

* Update snacks_other.dm

* Update snacks_other.dm

* Update medicine_reagents.dm

* Update medicine.dm

* Update chem_synthesizer.dm

* Update hypospray.dm

* Update snacks_other.dm

* Update snacks_other.dm

* Add files via upload

* Update snacks_other.dm

* Delete ambrosia.dm

* Delete cannabis.dm

* Add files via upload

* Update buffs.dm

* Update medicine.dm

* Update medbot.dm

* Update Sleeper.dm

* Update medbot.dm

* listen, i know what this looks like

* yes, i did this in the webeditor

* Update medicine.dm

* Update medbot.dm

* Update borghydro.dm

* Update Sleeper.dm

* Update robot_upgrades.dm

* Fixes metabolism rate

Don't tell cobby I did this one on my phone

* Updates metabolism rate for real

* fixes spelling errors

* Add files via upload

* Update medicine_reagents.dm

* Update medicine_reagents.dm
2019-07-24 12:18:11 -04:00
Qustinnus b33d1c49a3 [READY] Floydmats (Datum materials) & custom toolboxes (#45118)
* Initial work

* more

* ass

* wsedfwedff

* asss

* test

* stuff

* fuck

* sss

a

* kms

* asdadwedwdfwefwef

* start

* test

* dwwdew

* ewefwfef

* Redemption machine (#8)

* Redemption machine

* Removes debug messages

* changes

* fuckmyshitup

* coin mint works with new material shenanigans (#10)

* Auto stash before merge of "materials" and "origin/materials"

* woops

* furnace (#11)

* autolathe manufacturing of toolboxes

* eggs in a basket

* some small changes

* matcolors

* documentation

* more documentation and effects

* done

* Color man bad (#12)

* fixes designs

* ass

* more fixes

* fuck me

* firestacks adder

* epic fixes

* fixes designs

* DONE DIDDILY DOO

* removes category macro

* ch-ch-ch-changes

* fixes some stuff

* Fixes display of ore values (#9)

* Redemption machine

* Removes debug messages

* Re-adds value display

* Replaces the fire stacking component with an element instead (#13)

* fixes examine

* fixes ligma bugs

* double ligma boofus

* fix

* misses some defines

* fixes ORM

* Update code/datums/components/material_container.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* fixes

* Makes glass objects weaker (#14)

* Makes glass objects weaker

* uses correct proc

* fixes shit

* honk honk

* better

* oh shit oh fuck

* fixes

* fuck ORMs

* fixes the biogen

* documentation

* ass (#15)

* component

* changes

* ass

* ass

* doc

* Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent"

* fixes rounding

* fixed
2019-07-24 11:27:01 -04:00
oranges 4bb48522ea Merge pull request #45360 from JJRcop/clarified_gross
Rename define in other_reagents.dm
2019-07-24 15:42:54 +12:00
bgobandit f2fad8fcca Replaces vitiligo, revitiligo with two new symptoms: disfiguration and polyvitiligo. (#45297)
* Replaces vitiligo, revitiligo with polyvitiligo (adds colorful reagent) and disfiguration symptoms.

* honk

* makes requested changes and changes colorful reagent to crayon powder

* blacklists the crayonpowders that make you invisible or do nothing

* adds message to disfiguration apply
2019-07-23 12:52:25 -04:00
nemvar 4e82d53c6f Reworked electrocute_act to fit my fantasy while squashing some bugs. (#45291)
* Reworked electrocute_act
This still isn't perfect, ideally this would use flags and stuff but I don't have the energy for a change of that size.

* Removes spec_electrocute_act and makes the species siemens_coeff actually work.

* Readds the secondary shock
2019-07-23 02:43:23 -07:00
Time-Green d18fe2101a [READY] Plumbing improvements and chemical synthesizers (#45185)
Removes dumb visual bugs.
Put the copy pasted wrench stuff for disabling and enabling the component, in the component using a new signal from default_unfasten_wrench.
Add a general plumbing machinery subtype. Right now it's mainly for cataloging.
Adds the chemical synthesizer. You can select a single chemical and an amount between 0 and 5. It will produce it every tick. Should be combined with other synthesizers to create meth factories.
Makes the liquid pump a fully functioning machine.

cl
add: The station comes one step closer to plumbing with the introduction of the chemical synthesizer.
sprite: sprites for the synthesizer, input and output commissioned by @Meyhazah
/cl

I wanted to do all the plumbing basic equipment at once, but stuff like plumbing heaters is gonna be ugly if I don't rework them completely and I don't wanna scare the maintainers away.

There is slight copypasting from the chem_dispenser and with the chem synthesizer, but having it be inhereted would be a worse clusterfuck IMO.
2019-07-23 21:22:16 +12:00
nemvar 0a2651c150 Changes to chem vortex, now without ghost pulling. (#45325)
* goonvortex, now without sleep.

* Some small fixes

* adds a newline
2019-07-22 16:11:55 -07:00
nemvar 2f1732fa18 Fixes Hyposprays. The can be refilled once again (#45327) 2019-07-22 15:49:48 -04:00
nemvar 7ba60de3d6 Aheals now fix addictions and sanity. (#45329)
* Aheals now fix addictions and mood.

* Does it properly. Now uses a signal to detect the aheal.

* Removes a getComponent in living and puts that shit into the mood component.

* Fixes a small oversight with where I placed the moodie purge.
2019-07-22 15:42:30 -04:00
Jonathan (JJRcop) Rubenstein 4a3d5a555d Rename define in other_reagents.dm 2019-07-22 07:31:09 -04:00
JJRcop 18a15151d2 [Ready] Adds organic slurry, induces vomiting (#45192)
* Adds organic slurry

Created by dipping a dead mouse in welding fuel

* Change dreadded message

* Mouse dipping transfers all reagents
2019-07-22 00:21:15 -04:00
bigfatbananacyclops ea428f069c Changes medkits contents (#45216)
* pee pee poo poo

* pee pee poo poo

* Changes medkit contents

* Changes medkit contents

* Changes medkits contents

* Changes medkit contents

* Changesmedkitcontents
2019-07-21 23:01:32 -04:00
Krysonism fce4309234 [READY]Custom reagent icecream + tweaks (#44939)
About The Pull Request

This pull requests lets the ice cream vat dispense custom ice creams flavoured with a reagent of your choice from an internal beaker. The ice cream takes the name and reagent colour of the master reagent.

You can also easily refill the ice cream vats ingredient storage by inserting a beaker and clicking the refill from beaker button.

I also plan on adjusting the colour of a few reagent that i think deserve good looking ice creams but do not have the colour for it.
Why It's Good For The Game

The ice cream vat is currently really lame, the fun comes from making strange and interesting flavours, a feature that is absent from /tg/. No more!

The ice creams in this screenshot are flavoured with earthsblood, crank, romerol, krokodil, turbo and happiness, but the possibilities are endless, you can be bold and incorporate some mayonnaise or just play it safe with caramel.
Changelog

cl
add: NT has made breakthroughs in ice cream science, ice creams can now be flavoured with any reagent!
tweak: The ice cream vat now accepts beakers.
/cl
2019-07-19 22:51:13 +12:00
skoglol cc9913434a Medipen and regen cores can now be used in hand (#45161)
* Medipen and regen cores can now be activated in hand.

* Autodoc

* Old regen core description.

* Cyborg proc begone

* cleanup, no tk shenanigans.

* Removed unusable pen.

* better return.
2019-07-17 11:51:48 -04:00
Fikou 11535e5754 Clown Mutation (Clumsy) and Wizard Mutations can no longer be cured. (#45201)
* no mutadone cure

* no loop

* oops

* mutation fix
2019-07-16 18:13:08 -04:00
nemvar a3a5cf647c Replaces the slime extract in the clown biodome with a superlube sprayer. (#45134) 2019-07-15 10:10:38 -04:00
XDTM a5296e434c Makes undeads and androids have no metabolism (#44846)
About The Pull Request

Added two new traits, TRAIT_NOMETABOLISM and TRAIT_TOXIMMUNE. Does what it says on the tin, making livers not process reagents at all (except liverless reagents) and gives immunity to toxin damage. Species with NOMETABOLISM spawn with no liver (NOLIVER is now redundant and has been removed). This trait also prevents liver failure damage, for obvious reasons.

These traits have been given by default to androids (artificial, they were already immune to chemical healing anyway), zombies (who have their own regeneration) and skeletons (milk still works).

Other changes:

    Species' handle_reagents proc now fires before checking for metabolization, so species can process chems even when liverless.
    Removed the calcium healer trait, making it into a species handle_reagents check for each affected species (skeletons, plasmamen, bone golems). Skeletons now also heal burn damage from milk, since it's one of the few forms of healing they have available.

Note:
These traits should logically be applied to plasmamen and golems, but i intentionally left them out for now since it would be a significant balance shift, and there should be a proper alternative way of healing them first.
Why It's Good For The Game

Balances the significant benefits of being undead with a significant negative: being immune to chemical healing. Since zombies don't really rely on it and androids were already heal-immune, this mostly affects liches, and i believe it should be fine: considering that the main point of the spell is the resurrection mechanism, the space, gas, pierce, and heat/cold immunity they also gain should be counterbalanced by having a harder time recovering from injuries.

There is also a silver lining to having this trait: poison immunity. Effectively this is a buff to androids and zombies, the latter especially because they can no longer process mutation toxins. While this tactic is creative, it also trivializes a very expensive investment of TC. I might still add a liverless way to apply mutation toxins later on, but zombies shouldn't be effectively one-shot by a syringe gun.
Changelog

cl
add: Androids, skeletons and zombies no longer metabolize reagents. As such they no longer benefit from healing reagents, nor are affected by poisons and toxins.
add: These species are now also immune to any other form of toxin damage.
tweak: Milk now also heals burn damage for skeletons.
/cl
2019-07-15 09:07:26 +12:00
Jordie f42075568d Merge pull request #45076 from ExcessiveUseOfCobblestone/LexLoser
Lexorin Requires Salbu Instead of Oxygen
2019-07-10 21:40:23 +10:00
ShizCalev f2de4a8923 Merge pull request #45062 from nemvar/runtimeitchingpowder
Fixes itching powder runtime
2019-07-09 15:51:55 -04:00
skoglol 799c29b2ee Makes black and blue crayon effects less intense. (#45040)
* Makes black and blue crayons less intense.

* bigletters
2019-07-09 11:16:15 -04:00
Time-Green ceeff661a0 [READY] Plumbing (#44833)
cl Time-Green
add: Adds plumbing pipes and some hidden plumbing related machines. They're not available in-game yet.
sprites: Geyser and geyser pump sprites created by Mey-Ha-Zah!
/cl
Adds the following objects:

    Fluid ducts . Like atmos pipe, but for reagents. They're smart and can be seperated by layer and color

    Geysers. They spawn on lavaland and can be harvested with liquid pumps or just beakers.

    Liquid pumps. For pumping geysers. They need to be on a wire node and connected to a duct network.

    Plumbable reagent dispenser subtype.

    New plumbing RPD specific RPD.

    Plungers. The reinforced plunger can be used for plunging geysers to activate them. They currently serve no other function and can't be worn as a hat yet.

They're all disabled and admin only.

Adds the following systems:

    Ductnet datum. They pretty much say "hey, we're connected"

    Plumbing component. You can turn any movable atom into a plumbable thing. Comes with overlays and everything. They're essential for everything that has input and outputs, except pipes. That means you can have machines connected to both atmospheric pipes and fluid ducts. They only connect with layer 3 ducts.

    Fluid subsystem that handles the processing on the plumbing machinery and other plumbing related stuff.

Basically atmospherics but with reagents. Reagents are pressurized and thus transferred instantly, to avoid those stupid leftovers in pipes no one likes. I am PRing it now because if I were to add a dozen or so associated machines, it would be too much of a pain to manage/review in one PR. It would also be a massive waste if people didn't even want it in the first place.

Also yes all of this works (as far as I know)

Things I plan to add in later PR's

    Layers / colors (maybe) done
    Machinery (Stuff like chemical processors, filters, special mixing chambers and factories)
    Make geysers more interesting, so chemists/atmostechs/cargotechs/assistants can go to lavaland and get some exotic stuff.
    Pipe fractures. Damaged pipes could do the cartooney water soaker beam coming out to shoot at people cause why the fuck not.

Code concerns:

    Connecting is handled through pipes only. Not sure if this is the best approach. This means plumbing devices cant directly connect to each other without pipes. I could add some exceptions to handle it. I could also take connecting away from pipes and make it a global proc, with alot of exceptions since it'd be handling both plumbing machinery and the ducts.

    Reagent transferring. Basically the transfer is instantaneous from A to B. I did this because stuff getting stuck in pipes could pose some serious mixing problems with chemistry, since it's alot more delicate than atmos. I could understand if people would want it to be like atmos. It wouldn't be difficult to change.

Also for testing I suggest you set the pipe_dispenser to category 3 to print fluid ducts. My tests were done with
/obj/structure/geyser
/obj/structure/reagent_dispensers/plumbed/storage
/obj/item/plunger/reinforced
/obj/machinery/power/liquid_pump
/obj/item/pipe_dispenser/plumbing
that and standard tools for setting things up
2019-07-09 11:58:02 +12:00
ExcessiveUseOfCobblestone fc3e619ab6 LUXOIORIOAIRON 2019-07-08 18:58:06 -04:00
Krysonism 7885aa52a0 [READY]Adds moodlets to appropriate drugs and drug-like reagents (#44985)
* Adds narcotic moodies

Krokodil, fentanyl and morphine now trigger moodies.

* Makes the duration comparable to similar moodies

+Morphine now uses the correct moodie.

* Adds moodies to crank, meth and bathsalts.

* Remove comma splice
2019-07-08 13:52:59 -04:00
nemvar 26b7ea3fe7 Fixes itching runtime 2019-07-08 15:43:19 +02:00
Jordie ab745ff79e Merge pull request #45002 from nemvar/sprinklesprinklelittlestar
Fixes a sprinkles runtime
2019-07-08 23:02:06 +10:00
Garen Crownguard 534a9140aa merge 2019-07-05 17:59:38 -05:00
nemvar f32e323f35 Fixes a sprinkles runtime 2019-07-05 22:59:59 +02:00
Krysonism ffe578aacb [READY]Replaces Trekchems with Cobby Category 2 Chems + Chem Tweaks (#44531)
* Adds adjustLiverLoss & getLiverLoss procs to carbon

* Adds trophazole

Adds trophazole, a brute healer that makes doctors take a more holistic approach to heal, It is highly reagent efficient by converting nutriment to healing peptides. Creates an avenue for cooperation between kitchen and  medbay.

* Adds rhigoxane

Rhigoxane is a chilly burn healer that works best in a spray bottle and is capable of extinguishing fires.

* Adds thializid

This tox healer has great potential and mixability, balanced by requiring the doctor to take note of the patients liver health as well as using proper dilution and an iv pole; that wont fit in a powergamers pocket.

* Charcoal  + trans_to changes

Makes charcoal only work when ingested, and adds a new proc in reagent holder, lets trans_to react the transferred reagents if a method is chosen.

* Medical + Syndicate spray bottles

Medical spray bottles have been added to techweb under the biotech node for medical vapor application, alt click to change their skin.
Two suspicious spray bottles have been added as expensive contraband items in the chemdrobe. They have one extra spray range and a random suspicious skin from a pool of 8.
The large spray bottle and the space cleaner bottle also have new icons.
In addition trophazole and MMF have new colors.

* Adds chempacks

the IV medicine bag, or chem pack is the blood pack analogue for chems, it is easy to fill like a beaker but can also be permanently sealed to prevent spillage and mitigate tampering. It can be renamed with a pen. Both the new chem pack and the old blood pack have been added to the medical lathe and biotech node.

* Adds recipes to thializid and trophazole

Also fixes the rhigoxane recipe

* Medsprays are now medigels + fixes

chem packs can now be stored in the smartfridge and chem bag.

Medsprays were renamed medigels to reduce confusion. Calling them medical sprays made no sense since they apply chems through the patch method. 

The lore for the new medigels  is that they spray a thick gel onto the skin that dries into a film.

* minor fixes + mint frosting

I have tried to fix the problems people have pointed out. And the peptides now taste like mint frosting.

* Readds my cleaner sprites

* Adds liver damage to thializid + adds on_transfer proc

Thializid has a liver cost, the cost is worse if you have already sustained liver damage. Fixes weirdness by moving the reagent conversion effects from reaction_mob to on_transfer

* Fixes chem bag examine

The chem bag examine now werks, also fixed a typo in the description.

* Adds a clumsy check to sealing the chem pack

* Makes kelo, bicard and anti-tox unmixable.

I have retained the tricord recipe for now in case someone manages to collect all 3 through non-dispenser means. Think of it like collecting all the dragon balls but lame.

* Makes damp rag apply on_transfer effects

* glass and food now work with trophazole

glasses and food now call the on_transfer proc via trans_to

* Another round of fixes

Replaces 0/1 values with TRUE/FALSE where appropriate. Removes the debug printout from the spray bottle reskin. Replaces one instance of L.damage with C.GetLiverLoss().

* Rhigoxane recipe is now COOLER

200k was too warm since cryostylane cools down so much by itself upon mixing. 
Now the chemist has to choose between adding oxygen for instant cooling or using the heater/cooler to conserve energy.

* Removes the seal() proc and moves its guts into AltClick

* Item_state switching moved to reskin_obj

* Fixes missing medical sprayer left inhand

the sprayer_med_yellow inhand sprite now has the correct name.

* Fixes inhand updating

* Update code/modules/mob/living/carbon/damage_procs.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update code/modules/mob/living/carbon/damage_procs.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Tries to add typecache

* Moves the typecache and makes it static
2019-07-05 09:50:59 -04:00
RandolfTheMeh e9dab4c665 Universal Organ Damage system (#44710)
About The Pull Request

So organ damage is a thing now associated with general object of organ, meaning all organs inherit a damage variable, failing boolean, healing variable, and maxHealth variable. The proc applyOrganDamage takes in the damage and organ path, applying damage/healing to said organ. While an organ is in use, it heals a small amount over time (granted the organ is not failing), with this fraction being set by the healing variable.

This also reworks preexisting organ damage systems to function more so on the universal organ damage system, the liver specifically. So much code exists in regards to eyes/blindness and ears/deafness that I'll need to go ahead and take a longer time combing through the code to get everything that can reasonably be tied to those two organs and their level of damage reworked to function off of the organ damage system, as opposed to just a trait add/remove system.

Lastly, this slightly reworks scanners, since now you need to check for every organ in the body. Since organs are stored as "the [organ]" with the method I used to get them, the phrasing on the medical scanner was changed to make more sense given it now has to say something along the lines of "severe/minor damage detected within [the organ]". I'll likely add another proc if I cannot find a way to get the organ's max health during this operation, since a static number determining minor/severe damage does not work when an organ's max health is less than the typical 100 points (as is the case with eyes).
Why It's Good For The Game

Every organ can be damaged, though not every damaged organ does anything right now. Damaged livers do the same thing as they did previously, and damaged eyes develop varying levels of vision impairments. The benefits to this PR are more for future coding projects than it is for the game currently, with no foreseeable changes to the way it's played currently.
Changelog

cl
code: Universal Organ Damage variables and procs
/cl
2019-07-05 09:40:30 +12:00
XDTM d834ae0364 Abductor chem dispenser (#44659)
About The Pull Request

Adds an abductor chem dispenser, buyable for 2 points from the abductor rewards console.
Buying it spawns a beacon, which can be activated in hand to drop it and spawn the dispenser after 3 seconds if the tile is free of obstructions.
The dispenser contains all the reagents of a fully upgraded, emagged dispenser plus plasma and uranium.
Why It's Good For The Game

More tools for abductors means more possible abductor shenanigans, and personally i'm all for making the no-murderbone antag as fun as possible.
Changelog

cl XDTM
add: Abductors can now buy a special chem dispenser for 2 points. The machine is delivered as a beacon which can be used when standing on any free tile to spawn it.
/cl
2019-07-05 09:37:49 +12:00
bgobandit d1ebea42b5 Composting and grinding now drops trash items if applicable (#44946)
Fixes bowls being lost when composting or grinding food in bowls.
2019-07-04 12:52:37 -07:00
oranges 64460ae3ca Merge pull request #44825 from AutomaticFrenzy/patch/lints
In advance of eventually adding SpacemanDMM's linter to Travis, fix everything it can currently detect.

Some lists, including global lists, are given types so that L[i].foo expressions can be checked.

Some procs are given a new form of return type annotation so that DuplicateObject(O).forceMove()-type invocations can be checked.

Open to syntax suggestions on the return type annotations, and on whether the preprocessor strategy makes sense.

Return type syntax is currently roughly:

    <typepath> | <paramname>([_])*(.type)?
2019-07-03 19:31:11 +12:00
ShizCalev 6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00
CPTANT 27f48cbf7a Adds OD to styptic and sulfur sulfadiazine, buffs oxandrolone and salicyclic acid (#44657)
* Adds OD to styptic and sulfur sulfadiazine, buffs oxandrolone and sal acid

* Increases OD threshold to 45
2019-07-01 12:38:37 -04:00
kingofkosmos ad64678c48 Merge branch 'addswarningspans' of https://github.com/kingofkosmos/-tg-station into addswarningspans 2019-07-01 13:32:24 +03:00
kingofkosmos 51f77267f4 * revert error spans 2019-07-01 13:28:15 +03:00
oranges 7adaf7d900 Merge pull request #44685 from Tlaltecuhtli/patch-38
fixes BVAK injectors having salburol instead of perficilin
2019-06-29 21:14:16 +12:00
oranges 391c65ec4a Merge pull request #44840 from JJRcop/stasis_stops_metab
Stasis calls end_metabolism on reagent holder
2019-06-29 21:11:58 +12:00
XDTM d70c43c5f1 Checks for metabolization on some has_reagent (#44653)
About The Pull Request

Stuff that should logically require you to actually be metabolizing the reagent now requires a liver, or the reagent to not need one.
Some reagents have been granted self consuming status, like holy water, since their effects are not tied to the metabolism.

Fixes #44650
Fixes #43024 since there should be no real way to mitigate the constant toxin damage now
Why It's Good For The Game

Less exploits with livers, more consistency in mechanics.
Changelog

cl XDTM
fix: Viral healing symptoms that are tied to reagents now also require a functioning liver to work.
tweak: Holy water, Pyrosium, Cryostilane, Napalm and Phlogiston no longer need a liver to have their effects.
/cl
2019-06-29 21:08:38 +12:00
AnturK 89438fae72 Fix a few reagent runtimes (#44824) 2019-06-27 21:42:50 -07:00
vuonojenmustaturska a61b86a052 fixes2 (#44736) 2019-06-27 14:13:19 +02:00
kingofkosmos c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +03:00
kingofkosmos ec5c82029a * "Is already...", "Can not...", "Not when..." etc. 2019-06-27 06:15:43 +03:00
Jonathan (JJRcop) Rubenstein 3b933548cf Stasis calls end_metabolism on reagent holder
amanitin acts on delete instead of when metabolism stops
2019-06-26 19:36:48 -04:00
kingofkosmos d7dd679b5a Fix span endings (#44812)
Adds a slash to instances of <span>" --> </span>".
2019-06-26 15:11:03 -07:00
Tad Hardesty ba95173289 Fix keyword argument warnings 2019-06-26 01:59:57 -07:00
kingofkosmos 6bbb64e2cf * more warnings 2019-06-25 21:46:21 +03:00
kingofkosmos fb9731492c * extra spaces removed from "span class = '" --> "span class='"
* warning-spans added to cases of "You need..."
2019-06-25 21:03:25 +03:00
kingofkosmos df1aa091b2 * adds warning-spans to various messages 2019-06-24 21:05:22 +03:00
Garen Crownguard 3a37d0322c merge 2019-06-23 20:39:24 -05:00