diff --git a/GainStation13/code/datums/diseases/advance/symptoms/berry.dm b/GainStation13/code/datums/diseases/advance/symptoms/berry.dm index eef203ce..c46df335 100644 --- a/GainStation13/code/datums/diseases/advance/symptoms/berry.dm +++ b/GainStation13/code/datums/diseases/advance/symptoms/berry.dm @@ -49,3 +49,19 @@ to_chat(user, "You get some juice out of you...") return ..() + +/obj/effect/decal/cleanable/juice + name = "berry juice" + desc = "It's blue and smells enticingly sweet." + icon = 'GainStation13/icons/turf/berry_decal.dmi' + icon_state = "floor1" + random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7") + blood_state = BLOOD_STATE_JUICE + bloodiness = BLOOD_AMOUNT_PER_DECAL + +/obj/effect/decal/cleanable/juice/Initialize() + . = ..() + reagents.add_reagent(/datum/reagent/blueberry_juice = 5) + +/obj/effect/decal/cleanable/juice/streak + random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5") diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index f0f64e65..3d1ce29f 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -116,6 +116,9 @@ if(!no_mob_color) M.add_atom_colour(picked_color, WASHABLE_COLOUR_PRIORITY) M.adjust_fatness(1, FATTENING_TYPE_CHEM) + if(prob(2)) + new /obj/effect/decal/cleanable/juice(M.loc) + playsound(M.loc, 'sound/effects/splat.ogg',rand(10,50), 1) ..() /datum/reagent/blueberry_juice/on_mob_add(mob/living/L, amount) diff --git a/GainStation13/icons/turf/berry_decal.dmi b/GainStation13/icons/turf/berry_decal.dmi new file mode 100644 index 00000000..8af70867 Binary files /dev/null and b/GainStation13/icons/turf/berry_decal.dmi differ diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 5ea0dada..81d03577 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -161,6 +161,7 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) #define BLOOD_STATE_OIL "oil" #define BLOOD_STATE_NOT_BLOODY "no blood whatsoever" #define BLOOD_AMOUNT_PER_DECAL 20 +#define BLOOD_STATE_JUICE "juice" //Blood Decal Colors #define BLOOD_COLOR_HUMAN "#dc0000" @@ -171,6 +172,7 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) #define BLOOD_COLOR_LIZARD "#db004D" #define BLOOD_COLOR_UNIVERSAL "#db3300" #define BLOOD_COLOR_BUG "#a37c0f" +#define BLOOD_COLOR_JUICE "#0004ff" //suit sensors: sensor_mode defines diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index ef9e1d1a..9d7edd86 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -24,6 +24,8 @@ /obj/effect/decal/cleanable/blood/update_icon() color = blood_DNA_to_color() + if(blood_state == BLOOD_STATE_JUICE) + color = BLOOD_COLOR_JUICE /obj/effect/decal/cleanable/blood/old name = "dried blood" diff --git a/icons/effects/footprints.dmi b/icons/effects/footprints.dmi index 69207097..d2db6d0a 100644 Binary files a/icons/effects/footprints.dmi and b/icons/effects/footprints.dmi differ