diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 13d1621f379..4bc8e6ada94 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -53,4 +53,6 @@ var/xylophone = 0 //For the spoooooooky xylophone cooldown var/mob/remoteview_target = null - var/meatleft = 3 //For chef item \ No newline at end of file + var/meatleft = 3 //For chef item + + var/slime_color = "blue" //For slime people this defines their color, it's blue by default to pay tribute to the old icons \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index e0bba3ba511..6b93a38a19c 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -418,8 +418,10 @@ proc/get_damage_icon_part(damage_state, body_part) if(dna) switch(dna.mutantrace) - if("golem","slime","shadow","adamantine") + if("golem","shadow","adamantine") overlays_standing[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_s") + if("slime") + overlays_standing[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/slimemutant.dmi', "icon_state" = "[slime_color]_[dna.mutantrace][fat]_[gender]_s") else overlays_standing[MUTANTRACE_LAYER] = null diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 0df965d76c9..5a8c8d66175 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -647,6 +647,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 throw_speed = 3 throw_range = 6 origin_tech = "biotech=4" + _color = "grey" var/Uses = 1 // uses before it goes inert /obj/item/slime_extract/New() @@ -655,73 +656,100 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 reagents = R R.my_atom = src +/obj/item/slime_extract/attack(mob/living/carbon/human/M as mob, mob/user as mob) //changing slime people colors + if(M.dna.mutantrace != "slime" || M != user) return + + M.slime_color = _color + user <<"You absorb the core and your color shifts!" + M.update_mutantrace() + del(src) //Finally a tidy way to remove all the used cores lying about + + + /obj/item/slime_extract/grey name = "grey slime extract" icon_state = "grey slime extract" + _color = "grey" /obj/item/slime_extract/gold name = "gold slime extract" icon_state = "gold slime extract" + _color = "gold" /obj/item/slime_extract/silver name = "silver slime extract" icon_state = "silver slime extract" + _color = "silver" /obj/item/slime_extract/metal name = "metal slime extract" icon_state = "metal slime extract" + _color = "metal" /obj/item/slime_extract/purple name = "purple slime extract" icon_state = "purple slime extract" + _color = "purple" /obj/item/slime_extract/darkpurple name = "dark purple slime extract" icon_state = "dark purple slime extract" + _color = "darkpurple" /obj/item/slime_extract/orange name = "orange slime extract" icon_state = "orange slime extract" + _color = "orange" /obj/item/slime_extract/yellow name = "yellow slime extract" icon_state = "yellow slime extract" + _color = "yellow" /obj/item/slime_extract/red name = "red slime extract" icon_state = "red slime extract" + _color = "red" /obj/item/slime_extract/blue name = "blue slime extract" icon_state = "blue slime extract" + _color = "blue" /obj/item/slime_extract/darkblue name = "dark blue slime extract" icon_state = "dark blue slime extract" + _color = "darkblue" /obj/item/slime_extract/pink name = "pink slime extract" icon_state = "pink slime extract" + _color = "pink" /obj/item/slime_extract/green name = "green slime extract" icon_state = "green slime extract" + _color = "green" /obj/item/slime_extract/lightpink name = "light pink slime extract" icon_state = "light pink slime extract" + _color = "lightpink" /obj/item/slime_extract/black name = "black slime extract" icon_state = "black slime extract" + _color = "black" /obj/item/slime_extract/oil name = "oil slime extract" icon_state = "oil slime extract" + _color = "oil" /obj/item/slime_extract/adamantine name = "adamantine slime extract" icon_state = "adamantine slime extract" + _color = "adamantine" ////Pet Slime Creation/// diff --git a/icons/effects/slimemutant.dmi b/icons/effects/slimemutant.dmi new file mode 100644 index 00000000000..4cbfb3b6e7b Binary files /dev/null and b/icons/effects/slimemutant.dmi differ