cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nymph head flowers. (#3634)

Browse Source 
Adds a head flower to 5% of diona nymphs.
Also changes get_random_colour() to return a proper RGB string instead of expecting the caller to add the #.
This commit is contained in:
Zuhayr
2017-10-16 11:47:45 -05:00
committed by Lohikar
parent efd5fd1b72
commit 30d92571cf
8 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/Cleanable/humans.dm
+4 -4
View File
@@ -58,7 +58,7 @@
dry()
/obj/effect/decal/cleanable/blood/update_icon()
if(basecolor == "rainbow") basecolor = "#[get_random_colour(1)]"
if(basecolor == "rainbow") basecolor = get_random_colour(1)
color = basecolor
/obj/effect/decal/cleanable/blood/Crossed(mob/living/carbon/human/perp)
@@ -121,7 +121,7 @@
amount -= taken
user << "<span class='notice'>You get some of \the [src] on your hands.</span>"
LAZYINITLIST(user.blood_DNA)
if (blood_DNA)
user.blood_DNA |= blood_DNA.Copy()
@@ -185,11 +185,11 @@
var/image/giblets = new(base_icon, "[icon_state]_flesh", dir)
if(!fleshcolor || fleshcolor == "rainbow")
fleshcolor = "#[get_random_colour(1)]"
fleshcolor = get_random_colour(1)
giblets.color = fleshcolor
var/icon/blood = new(base_icon,"[icon_state]",dir)
if(basecolor == "rainbow") basecolor = "#[get_random_colour(1)]"
if(basecolor == "rainbow") basecolor = get_random_colour(1)
blood.Blend(basecolor,ICON_MULTIPLY)
icon = blood