Makes slimes have slime jelly for blood (#14665)

* Makes slimes have slime jelly for blood, reduces the healing and toxin effects of slime jelly

* Slime jelly is a diffrent colour so it does not look like blood, slime jelly iv bag added, said bag is now found in nanomed plus

* Makes slimes bleed in c o l o u r, makes iron affect exotic blood species.

* Makes slime blood always the same colour as skin, fixing dye and CMA issues

* Fixes iron mistake

* Fix henk stuff

Adds EXOTIC_COLOR trait, used if you want exotic blood to be coloured when splattering, in this case slime blood. Removes uneeded blood data stuff

* Update toxins.dm

* Fixes the black blood issue

By B-B-BLENDING the slime colour with a medium grey, it helps match the blood colour to the true colour of the slime way better, meaning that a default slime that looks grey (but techicaly has pitch black skin codewise) will have grey blood.

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Signals for henk, fixes henks worries, less processing

* Fixes runtime

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/surgery/organs/blood.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/surgery/organs/blood.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

Co-authored-by: farie82 <joepvelden@hotmail.com>
This commit is contained in:
Qwertytoforty
2020-10-31 17:49:55 -04:00
committed by GitHub
co-authored by farie82
parent ee664a866f
commit e3ee0b01e8
12 changed files with 70 additions and 11 deletions
@@ -307,6 +307,7 @@
/mob/living/carbon/human/proc/update_dna()
check_dna()
dna.ready_dna(src)
SEND_SIGNAL(src, COMSIG_HUMAN_UPDATE_DNA)
/mob/living/carbon/human/proc/generate_valid_species(var/check_whitelist = 1, var/list/whitelist = list(), var/list/blacklist = list())
var/list/valid_species = new()
@@ -26,7 +26,7 @@
male_cough_sounds = list('sound/effects/slime_squish.ogg')
female_cough_sounds = list('sound/effects/slime_squish.ogg')
species_traits = list(LIPS, IS_WHITELISTED, NO_SCAN)
species_traits = list(LIPS, IS_WHITELISTED, NO_SCAN, EXOTIC_COLOR)
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_SKIN_COLOR | NO_EYES
dietflags = DIET_CARN
@@ -34,7 +34,7 @@
flesh_color = "#5fe8b1"
blood_color = "#0064C8"
exotic_blood = "water"
exotic_blood = "slimejelly"
butt_sprite = "slime"
//Has default darksight of 2.
@@ -74,6 +74,9 @@
recolor = new()
recolor.Grant(H)
ADD_TRAIT(H, TRAIT_WATERBREATH, "species")
RegisterSignal(H, COMSIG_HUMAN_UPDATE_DNA, /datum/species/slime/./proc/blend)
blend(H)
/datum/species/slime/on_species_loss(mob/living/carbon/human/H)
..()
@@ -82,6 +85,13 @@
if(recolor)
recolor.Remove(H)
REMOVE_TRAIT(H, TRAIT_WATERBREATH, "species")
UnregisterSignal(H, COMSIG_HUMAN_UPDATE_DNA)
/datum/species/slime/proc/blend(mob/living/carbon/human/H)
var/new_color = BlendRGB(H.skin_colour, "#acacac", 0.5) // Blends this to make it work better
if(H.blood_color != new_color) // Put here, so if it's a roundstart, dyed, or CMA'd slime, their blood changes to match skin
H.blood_color = new_color
H.dna.species.blood_color = H.blood_color
/datum/species/slime/handle_life(mob/living/carbon/human/H)
// Slowly shifting to the color of the reagents
@@ -97,8 +107,11 @@
E.sync_colour_to_human(H)
H.update_hair()
H.update_body()
blend(H)
..()
/datum/species/slime/can_hear() // fucking snowflakes
. = TRUE