cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding var/list/atom_colours to /atom .

Browse Source 
The var will be used to store the various coloring that happen for the atom so that we can separate paint coloring from color that must be inherent to the atom (an initial color for example), or from certain coloring effect like revenant's blight, mob electrocution's black color, admin edit of the color var, green color from holding the greentext item, etc.
The list has four elements, used for four categories:
ADMIN_COLOUR_PRIORITY for admin varedits and very rate color effect like holding the greentext item (and other effects that should prime over any other potential source of coloring even temporary effects).
TEMPORARY_COLOUR_PRIORITY for short color effects like revenant blight on mob, mob electrocution making you all black for a couple seconds, effects that should be appearing above paint coloring.
WASHABLE_COLOUR_PRIORITY for pretty much all paint coloring like colorful reagent on mobs, coloring turfs with paint, etc.
FIXED_COLOUR_PRIORITY for color inherent to the atom, like a blob's color, any object with a color value given in its definition.

Fixes electocution animation on mob not making the mob all black (with the skeleton overlay blinking over it)
Spray cleaner and soap can now wash paint off mobs, turfs and objects.
This commit is contained in:
phil235
2016-10-19 01:51:30 +02:00
committed by phil235
parent c5e7e0ed2a
commit 240f3a4c49
86 changed files with 326 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/effects/mines.dm
View File

@@ -115,6 +115,7 @@
desc = "You feel angry just looking at it."
duration = 1200 //2min
color = "red"
atom_colours = list("", "", "", "red")
/obj/effect/mine/pickup/bloodbath/mineEffect(mob/living/carbon/victim)
if(!victim.client || !istype(victim))
@@ -149,6 +150,7 @@
name = "Blue Orb"
desc = "You feel better just looking at it."
color = "blue"
atom_colours = list("", "", "", "blue")
/obj/effect/mine/pickup/healing/mineEffect(mob/living/carbon/victim)
if(!victim.client || !istype(victim))
@@ -160,6 +162,7 @@
name = "Yellow Orb"
desc = "You feel faster just looking at it."
color = "yellow"
atom_colours = list("", "", "", "yellow")
duration = 300
/obj/effect/mine/pickup/speed/mineEffect(mob/living/carbon/victim)