diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 853fc068d61..382fc8dd953 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -31,6 +31,7 @@ if(blob_core) blob_core.adjustcolors(blob_reagent_datum.color) + color = blob_reagent_datum.complementary_color ghostimage = image(src.icon,src,src.icon_state) ghost_darkness_images |= ghostimage //so ghosts can see the blob cursor when they disable darkness updateallghostimages() diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 995ce7c6913..139acb49eb3 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -409,7 +409,7 @@ /mob/camera/blob/verb/chemical_reroll() set category = "Blob" set name = "Reactive Chemical Adaptation (50)" - set desc = "Replaces your chemical with a different one" + set desc = "Replaces your chemical with a random, different one." if(!can_buy(50)) return @@ -417,13 +417,15 @@ var/datum/reagent/blob/B = pick((subtypesof(/datum/reagent/blob) - blob_reagent_datum.type)) blob_reagent_datum = new B + color = blob_reagent_datum.complementary_color + for(var/obj/structure/blob/BL in blobs) BL.adjustcolors(blob_reagent_datum.color) for(var/mob/living/simple_animal/hostile/blob/BLO) BLO.adjustcolors(blob_reagent_datum.color) - to_chat(src, "Your reagent is now: [blob_reagent_datum.name]!") + to_chat(src, "Your reagent is now: [blob_reagent_datum.name] - [blob_reagent_datum.description]") /mob/camera/blob/verb/blob_help() set category = "Blob" @@ -441,5 +443,5 @@ to_chat(src, "Storage Blobs are storage towers which will store extra resources for you. This increases your max resource cap by 50.") to_chat(src, "Node Blobs are blobs which grow, like the core. Like the core it can activate resource and factory blobs.") to_chat(src, "In addition to the buttons on your HUD, there are a few click shortcuts to speed up expansion and defense.") - to_chat(src, "Shortcuts: CTRL Click = Expand Blob / Middle Mouse Click = Rally Spores / Alt Click = Create Shield") + to_chat(src, "Shortcuts: CTRL Click = Expand Blob | Middle Mouse Click = Rally Spores | Alt Click = Create Shield Blob") to_chat(src, "Attempting to talk will send a message to all other overminds, allowing you to coordinate with them.") \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index a2ecc811e6a..ed792c03128 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -8,6 +8,7 @@ var/volume = 0 var/metabolization_rate = REAGENTS_METABOLISM var/color = "#000000" // rgb: 0, 0, 0 (does not support alpha channels - yet!) + var/complementary_color = "#000000" var/shock_reduction = 0 var/heart_rate_increase = 0 var/heart_rate_decrease = 0 diff --git a/code/modules/reagents/chemistry/reagents/blob.dm b/code/modules/reagents/chemistry/reagents/blob.dm index 29f373610d8..cea407199cd 100644 --- a/code/modules/reagents/chemistry/reagents/blob.dm +++ b/code/modules/reagents/chemistry/reagents/blob.dm @@ -14,6 +14,7 @@ description = "Deals High Brute damage, as well as Stamina damage." id = "ripping_tendrils" color = "#7F0000" + complementary_color = "#a15656" message_living = ", and you feel your skin ripping and tearing off" /datum/reagent/blob/ripping_tendrils/reaction_mob(mob/living/M, method=TOUCH, volume) @@ -29,6 +30,7 @@ description = "Deals High Burn damage, and sets the victim aflame." id = "boiling_oil" color = "#B68D00" + complementary_color = "#c0a856" message = "The blob splashes you with burning oil" message_living = ", and you feel your skin char and melt" @@ -45,6 +47,7 @@ description = "Deals High Toxin damage, causes Hallucinations, and injects Spores into the bloodstream." id = "envenomed_filaments" color = "#9ACD32" + complementary_color = "#b0cd73" message_living = ", and you feel sick and nauseated" /datum/reagent/blob/envenomed_filaments/reaction_mob(mob/living/M, method=TOUCH, volume) @@ -59,6 +62,7 @@ description = "Deals Medium Brute damage, but massive amounts of Respiration Damage." id = "lexorin_jelly" color = "#00FFC5" + complementary_color = "#56ebc9" message_living = ", and your lungs feel heavy and weak" /datum/reagent/blob/lexorin_jelly/reaction_mob(mob/living/M, method=TOUCH, volume) @@ -74,6 +78,7 @@ description = "Deals Randomized damage, between 0.33 to 2.33 times the standard amount." id = "kinetic" color = "#FFA500" + complementary_color = "#ebb756" message = "The blob pummels you" /datum/reagent/blob/kinetic/reaction_mob(mob/living/M, method=TOUCH, volume) @@ -87,6 +92,7 @@ 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" message = "The blob splashes you with an icy liquid" message_living = ", and you feel cold and tired" @@ -102,6 +108,7 @@ description = "Deals High Brute damage and sucks everyone and everything closer, creating a vortex of death." id = "dark_matter" color = "#61407E" + complementary_color = "#8f7ca0" message = "You feel a thrum as the blob strikes you, and everything flies at you" /datum/reagent/blob/dark_matter/reaction_mob(mob/living/M, method=TOUCH, volume) @@ -116,6 +123,7 @@ description = "Deals High Brute damage, and sends people flying away." id = "b_sorium" color = "#808000" + complementary_color = "#a2a256" message = "The blob slams into you, and sends you flying" /datum/reagent/blob/b_sorium/reaction_mob(mob/living/M, method=TOUCH, volume) diff --git a/icons/mob/blob.dmi b/icons/mob/blob.dmi index 1d2f53b03cc..ef70ac3155e 100644 Binary files a/icons/mob/blob.dmi and b/icons/mob/blob.dmi differ