Blood pools had a duplicate definition of "NO_CLIENT_COLOUR" while it
wasn't defined at all for blood trails.
This resulted in a bug where upon wearing a pair of noir shades or
becoming colourblind, blood trails would take on a different colouration
than blood pools (drips, etc.)
Now resolved by moving the duplicate definition to a place where it can
do some good.
* commit for branch swap
* branch swap again
* BLEED
* trying to clear up compile errors
* i killed everything when i tested this...
* restorealltheblood
* I REMOVED A THING
* well some progress
* stop bleeding
* got to swap branches again.
* grr
* damn bloodcolors
* Squash everything
* color....colourrrrrrr
* color....colourrrrrrr
* well now that updated the branch...
* Changes
* Some tweaks..before i upload something major
* COLOR NOT COLOUR...COLOR
YES I KNOW NOT EVERYONE SPELLS IT LIKE THAT BUT MY GOD
* Foot print shit..
blood coloring is going to be PAIN
* trying to handle some colors..maybe.
* blood colorsing sucks..di i mention this?
* commenting cod malfunctions.
* Changes
* lets try this
* Its too late at night.
* blargh
* woops
* almost works...
* progress..
* Branch swap
* figured out the overlay issue....
* BRANCH SWAP
* BLARGH
* fixed merged conflicts..expect something to be horribly wrong.
* bunch of changes
* Major Fixes
- Moved blood_state and bloodiness var definitions to
/obj/effect/decal/cleanable/blood as well as /cleanable/Crossed(), in
order to make blood color work properly.
- These were not used by any other decal, so it was pointless.
- Tweaked human/add_blood so that hand_blood_color uses the correct
value now.
- Corrected gibs having the wrong basecolor.
- Tracks of different blood colors will no longer combine weirdly, and
will instead form seperate overlays.
- This also fixes all of the issues with tracks in general and not
updating correctly.
- Fixed transfering blood in add_fingerprint; the old detective code
didn't use the new format for add_blood().
- Fixed xenomorphs causing runtimes in makeTrail(), and gave them their
own trails. Sprites should probably be brightened later.
- Fixed mobs occasionally randomly having their blood_DNA list reset.
* may have accidently removed shit.
* Mrowl
* stiff
water is not bleeding
lowered trail making threshold
* tweaks then conflcits
* weee
* indent
* some tweaks
* somefox tweaks.
* derp
* why won't they bleed!?
* BLEED DAMMIT
* Flattist comments and removes simple animale blood volume
Cause i cannot get it to work right.
* PRAISE FLATTIST
* Simple animals have a blood volume now
Bug with trail fixed.
* changes
* thanksmrowlmrowl
* exotice blood trails
* makesure is an exotic bleeder has a bleed rate first...
* FoxBoxTweakSox
* BoxVoxSoXFox
* ONE MORE THING
* animalsbleedreds
* Buh? BUGH!
* thisismescreaming
* removing note needed thing
* Color changes but the rabbit hole continues.
* This is not pretty....
* wot
* IT WORKS DAMMIT
* colors.
* germaphobic commit..
* we have to use the old system
* nothing to see here
* doubleprocarady
* try to fix mulebots
* mulebot fixed
* DONE
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.
Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
Wee! Readds Disease1, kills off disease2, and finally removes poop.dmi
(fucking piece of shit)
Needs WAY more testing, most of which I don't know how to do yet, because
I've never used this system. Fun!
Changes:
- Virus2 has been removed completely.
- Some symptoms have not been readded. Aka, none of them have been
readded, I just wanted to get this shit ported.
- Virology has been updated slightly to mirror -tg-'s boxstation, as the
virus2 machines are gone.
- Welcome back, disease1
- The centrifuge, vials, splicer, analyzer, growerthing, have all been
replaced by the PanD.E.M.I.C. 2220
- No symptoms have been completely removed; However, vision symptoms
have been disabled pending byond 510, and genetics symptoms have been
disabled until "when I figure out how to fix them".
- Advanced Mutation Toxin now uses a disease, which turns people from
species, to slime person, to slime. Slime people are instantly turned
to a slime.
- Diseased touch now give people appendicitis. Yes, they VANT YOUR...
appendix.
- Virology now has a fridge with the following in it:
- Antiviral Syringes
- 1 Rhinovirus culture
- 1 Flu culture
- 1 Bottle of Mutagen
- 1 Bottle of Plasma
- 1 Bottle of Synaptizine
- A few more things, which I can't remember and can't look at while writing
this commit. Sometimes, git hurts.
TODO:
- Test more shit and figure out how the PanD.E.M.I.C. works/is supposed to
work.
- Fix genetics symptoms.
- Give vampires a less shitty diseased touch.
- Add appendicitis event.
-
Largely a port of https://github.com/Baystation12/Baystation12/pull/8038
(Credit to Zuhayr for his hard work on botany)
Breakdown of the port:
- Plant traits have been expanded drastically
- You want a bio-luminescent tomato that explodes into a cloud of acid
when thrown or stepped on? Or maybe a corn vine that entangles people
and injects them with mannitol and it's harvests that can be used as a
battery? Totally possible.
- Adds new random seeds! Replaces the egg-plant seed in the exotic seeds
crate from cargo with 2 of these.
- Literally random, they have randomly generated stats, chemicals, and
traits. Great for researching, and/or wasting cargo's supply points.
- Plant analyzers can now print off the last scan they recorded, meaning
you can distribute copies of the report to validate your claims of
having the dankest weed on station.
- Potatoes, carrots, watermelons, soybeans, and pumpkins can all be
sliced/diced/carved with ANY sharp object, such as knives, hatchets,
glass shards, and e-swords.
- This should give the chef a bit more room to make it look like he
actually is doing the work by slicing up fries by hand. The processor
still also works.
- New reagent: Wood Pulp
- Currently has no use in recipes, but any plant with this reagent in it
can be chopped into planks with a hatchet. Did someone order some
Ambrosia Deus planks?
- Also, vines with woodpulp are dense. You have been warned.
Now onto the stuff I did in addition to the stuff from Bay.
- Fixed typos where plasma was mistakenly called "phoron" in the port.
(Sorry bay)
- Replaced bay's botany mutation chances with our tiered mutation
system.
- Re-re-added tobacco, space tobacco, tea aspera, tea astra, coffee
arabica, and coffee robusta.
- Re-enabled the rolling of joints
- Made it possible to hand-roll cigarettes from tobacco / space tobacco.
(A requested / promised addition)
- Just like with joints, it will inherit any chems in the tobacco, has
the same reagent capacity as a joint, but looks and smokes like a cig
(lasts as long as the cigarettes) with a different name/description to
differentiate it from pre-made cigs.
- Corn can now be juiced in the grinder, in addition to grinding it.
Grinding corn will result in it's contained reagents (like corn starch),
while juicing corn will result in corn oil.
- Re-added the additional plant analyzer information when scanning trays
(displays age, weed level, etc)
Also cleaned up the recipes_microwave.dm file, removing the commented
out recipes that were distributed to the other machines during the
Kitchen Overhaul. Shortens the file a bit and makes it more readable.
I probably forgot stuff, so I will add things as I remember them / they
get pointed out.
