Maybe actually removes the last of the red crosses but probably not (#18533)

* this better be the last red crosses

* cmo icon

* just going to fix the cmo icon while i am here

* revents spawner icon changes

* defines blob colours
This commit is contained in:
Bm0n
2022-07-29 20:11:32 +01:00
committed by GitHub
parent 01e1298a4a
commit 7f83855f49
6 changed files with 48 additions and 23 deletions
+23
View File
@@ -83,6 +83,7 @@
#define COLOR_ASTEROID_ROCK "#735555"
#define COLOR_NULLGLASS "#ff6088"
#define COLOR_DIAMOND "#d8d4ea"
#define COLOR_HEALING_GREEN "#375637"
//Color defines used by the assembly detailer.
#define COLOR_ASSEMBLY_BLACK "#545454"
@@ -127,3 +128,25 @@
// Color matrix utilities
#define COLOR_MATRIX_ADD(C) list(COLOR_RED, COLOR_GREEN, COLOR_BLUE, C)
#define COLOR_MATRIX_OVERLAY(C) list(COLOR_BLACK, COLOR_BLACK, COLOR_BLACK, C)
// Blob primary colours
#define COLOR_RIPPING_TENDRILS "#7F0000"
#define COLOR_BOILING_OIL "#B68D00"
#define COLOR_ENVENOMED_FILAMENTS "#9ACD32"
#define COLOR_LEXORIN_JELLY "#00FFC5"
#define COLOR_KINETIC_GELATIN "#FFA500"
#define COLOR_CRYOGENIC_LIQUID "#8BA6E9"
#define COLOR_SORIUM "#808000"
#define COLOR_RADIOACTIVE_GEL "#2476f0"
#define COLOR_TESLIUM_PASTE "#20324D"
// Blob complementary colours
#define COMPLEMENTARY_COLOR_RIPPING_TENDRILS "#a15656"
#define COMPLEMENTARY_COLOR_BOILING_OIL "#c0a856"
#define COMPLEMENTARY_COLOR_ENVENOMED_FILAMENTS "#b0cd73"
#define COMPLEMENTARY_COLOR_LEXORIN_JELLY "#56ebc9"
#define COMPLEMENTARY_COLOR_KINETIC_GELATIN "#ebb756"
#define COMPLEMENTARY_COLOR_CRYOGENIC_LIQUID "#a8b7df"
#define COMPLEMENTARY_COLOR_SORIUM "#a2a256"
#define COMPLEMENTARY_COLOR_RADIOACTIVE_GEL "#24f0f0"
#define COMPLEMENTARY_COLOR_TESLIUM_PASTE "#412968"
+2 -2
View File
@@ -264,7 +264,7 @@
var/mob/living/carbon/human/itemUser = owner
//Because a servant of medicines stops at nothing to help others, lets keep them on their toes and give them an additional boost.
if(itemUser.health < itemUser.maxHealth)
new /obj/effect/temp_visual/heal(get_turf(itemUser), "#375637")
new /obj/effect/temp_visual/heal(get_turf(itemUser), COLOR_HEALING_GREEN)
itemUser.adjustBruteLoss(-1.5)
itemUser.adjustFireLoss(-1.5)
itemUser.adjustToxLoss(-1.5)
@@ -279,7 +279,7 @@
if(heal_points <= 0)
break
if(L.health < L.maxHealth)
new /obj/effect/temp_visual/heal(get_turf(L), "#375637")
new /obj/effect/temp_visual/heal(get_turf(L), COLOR_HEALING_GREEN)
if(iscarbon(L))
L.adjustBruteLoss(-3.5)
L.adjustFireLoss(-3.5)
+3 -1
View File
@@ -30,8 +30,10 @@
var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(src)) //hello yes you are being healed
if(overmind)
H.color = overmind.blob_reagent_datum.complementary_color
if(H.color == COMPLEMENTARY_COLOR_RIPPING_TENDRILS) //the colour define for ripping tendrils
H.color = COLOR_HEALING_GREEN //bye red cross
else
H.color = "#000000"
H.color = COLOR_BLACK
adjustHealth(-maxHealth * 0.0125)
/mob/living/simple_animal/hostile/blob/Process_Spacemove(movement_dir = 0)
+1 -1
View File
@@ -265,7 +265,7 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list(
for(var/mob/living/L in range(5, src))
if(iscultist(L) || iswizard(L) || isshade(L) || isconstruct(L))
if(L.health != L.maxHealth)
new /obj/effect/temp_visual/heal(get_turf(src), "#960000")
new /obj/effect/temp_visual/heal(get_turf(src), COLOR_HEALING_GREEN)
if(ishuman(L))
L.heal_overall_damage(1, 1, TRUE, FALSE, TRUE)
@@ -2,7 +2,7 @@
// The 4 damage
/datum/reagent/blob
description = ""
var/complementary_color = "#000000"
var/complementary_color = COLOR_BLACK
var/message = "The blob strikes you" //message sent to any mob hit by the blob
var/message_living = null //extension to first mob sent to only living mobs i.e. silicons have no skin to be burnt
can_synth = FALSE
@@ -17,8 +17,8 @@
name = "Ripping Tendrils"
description = "Deals High Brute damage, as well as Stamina damage."
id = "ripping_tendrils"
color = "#7F0000"
complementary_color = "#a15656"
color = COLOR_RIPPING_TENDRILS
complementary_color = COMPLEMENTARY_COLOR_RIPPING_TENDRILS
message_living = ", and you feel your skin ripping and tearing off"
/datum/reagent/blob/ripping_tendrils/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
@@ -33,8 +33,8 @@
name = "Boiling Oil"
description = "Deals High Burn damage, and sets the victim aflame."
id = "boiling_oil"
color = "#B68D00"
complementary_color = "#c0a856"
color = COLOR_BOILING_OIL
complementary_color = COMPLEMENTARY_COLOR_BOILING_OIL
message = "The blob splashes you with burning oil"
message_living = ", and you feel your skin char and melt"
@@ -50,8 +50,8 @@
name = "Envenomed Filaments"
description = "Deals High Toxin damage, causes Hallucinations, and injects Spores into the bloodstream."
id = "envenomed_filaments"
color = "#9ACD32"
complementary_color = "#b0cd73"
color = COLOR_ENVENOMED_FILAMENTS
complementary_color = COMPLEMENTARY_COLOR_ENVENOMED_FILAMENTS
message_living = ", and you feel sick and nauseated"
/datum/reagent/blob/envenomed_filaments/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
@@ -66,8 +66,8 @@
name = "Lexorin Jelly"
description = "Deals Medium Brute damage, but massive amounts of Respiration Damage."
id = "lexorin_jelly"
color = "#00FFC5"
complementary_color = "#56ebc9"
color = COLOR_LEXORIN_JELLY
complementary_color = COMPLEMENTARY_COLOR_LEXORIN_JELLY
message_living = ", and your lungs feel heavy and weak"
/datum/reagent/blob/lexorin_jelly/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
@@ -82,8 +82,8 @@
name = "Kinetic Gelatin"
description = "Deals Randomized damage, between 0.33 to 2.33 times the standard amount."
id = "kinetic"
color = "#FFA500"
complementary_color = "#ebb756"
color = COLOR_KINETIC_GELATIN
complementary_color = COMPLEMENTARY_COLOR_KINETIC_GELATIN
message = "The blob pummels you"
/datum/reagent/blob/kinetic/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
@@ -96,8 +96,8 @@
name = "Cryogenic Liquid"
description = "Deals Medium Brute damage, Stamina Damage, and injects Frost Oil into its victims, freezing them to death."
id = "cryogenic_liquid"
color = "#8BA6E9"
complementary_color = "#a8b7df"
color = COLOR_CRYOGENIC_LIQUID
complementary_color = COMPLEMENTARY_COLOR_CRYOGENIC_LIQUID
message = "The blob splashes you with an icy liquid"
message_living = ", and you feel cold and tired"
@@ -113,8 +113,8 @@
name = "Sorium"
description = "Deals High Brute damage, and sends people flying away."
id = "b_sorium"
color = "#808000"
complementary_color = "#a2a256"
color = COLOR_SORIUM
complementary_color = COMPLEMENTARY_COLOR_SORIUM
message = "The blob slams into you, and sends you flying"
/datum/reagent/blob/b_sorium/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
@@ -156,8 +156,8 @@
name = "Radioactive gel"
description = "Deals medium toxin damage and a little brute damage, but irradiates those struck."
id = "radioactive_gel"
color = "#2476f0"
complementary_color = "#24f0f0"
color = COLOR_RADIOACTIVE_GEL
complementary_color = COMPLEMENTARY_COLOR_RADIOACTIVE_GEL
message_living = ", and you feel a strange warmth from within"
/datum/reagent/blob/radioactive_gel/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume)
@@ -172,8 +172,8 @@
name = "Teslium paste"
description = "Deals medium burn damage, and shocks those struck over time"
id = "teslium_paste"
color = "#20324D"
complementary_color = "#412968"
color = COLOR_TESLIUM_PASTE
complementary_color = COMPLEMENTARY_COLOR_TESLIUM_PASTE
message_living = ", and you feel a static shock"
/datum/reagent/blob/teslium_paste/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 10 KiB