diff --git a/code/modules/mob/living/simple_animal/vore/shadekin/_defines.dm b/code/modules/mob/living/simple_animal/vore/shadekin/_defines.dm index b9318929acc..1567134c4df 100644 --- a/code/modules/mob/living/simple_animal/vore/shadekin/_defines.dm +++ b/code/modules/mob/living/simple_animal/vore/shadekin/_defines.dm @@ -6,6 +6,8 @@ #define RED_EYES 2 #define PURPLE_EYES 3 #define YELLOW_EYES 4 +#define GREEN_EYES 5 +#define ORANGE_EYES 6 #define AB_PHASE_SHIFTED 0x1 #define AB_SHADE_REGEN 0x2 \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/vore/shadekin/ability_procs.dm b/code/modules/mob/living/simple_animal/vore/shadekin/ability_procs.dm index 2788743516b..12de83549d5 100644 --- a/code/modules/mob/living/simple_animal/vore/shadekin/ability_procs.dm +++ b/code/modules/mob/living/simple_animal/vore/shadekin/ability_procs.dm @@ -19,7 +19,7 @@ //Shifting in if(ability_flags & AB_PHASE_SHIFTED) ability_flags &= ~AB_PHASE_SHIFTED - name = real_name = initial(name) + name = real_name for(var/belly in vore_organs) var/datum/belly/B = vore_organs[belly] B.escapable = initial(B.escapable) @@ -60,7 +60,7 @@ else ability_flags |= AB_PHASE_SHIFTED custom_emote(1,"phases out!") - name = real_name = "Something" + name = "Something" for(var/belly in vore_organs) var/datum/belly/B = vore_organs[belly] diff --git a/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm index 9e11dfc8e28..7748ca22546 100644 --- a/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm @@ -218,6 +218,10 @@ eye_icon_state = "e_purple" if(YELLOW_EYES) eye_icon_state = "e_yellow" + if(GREEN_EYES) + eye_icon_state = "e_green" + if(ORANGE_EYES) + eye_icon_state = "e_orange" eyeimage = image(icon,null,eye_icon_state) var/mutable_appearance/ma = new(src) @@ -297,6 +301,14 @@ //Yellow has extreme gains in darkness and loss in light. if(YELLOW_EYES) dark_gains = round((darkness - 0.5) * 4, 0.1) + //Similar to blues, but passive is less, and affected by dark + if(GREEN_EYES) + dark_gains = 0.25 + dark_gains += round((darkness - 0.5), 0.1) + //More able to get energy out of the dark, worse attack gains tho + if(ORANGE_EYES) + if(darkness >= 0.65) + dark_gains = 0.30 energy = max(0,min(initial(energy),energy + dark_gains)) @@ -404,6 +416,10 @@ gains = 4 if(YELLOW_EYES) gains = 3 + if(GREEN_EYES) + gains = 1 + if(ORANGE_EYES) + gains = 5 energy += gains diff --git a/code/modules/mob/living/simple_animal/vore/shadekin/types.dm b/code/modules/mob/living/simple_animal/vore/shadekin/types.dm index 496af1b90f4..3b3d102752c 100644 --- a/code/modules/mob/living/simple_animal/vore/shadekin/types.dm +++ b/code/modules/mob/living/simple_animal/vore/shadekin/types.dm @@ -164,6 +164,83 @@ /mob/living/simple_animal/shadekin/yellow/brown icon_state = "brown" +///////////////////////////////////////////////////////////////// +/mob/living/simple_animal/shadekin/green + name = "green-eyed shadekin" + eye_state = GREEN_EYES + health = 125 + hostile = FALSE + retaliate = TRUE + stop_when_pulled = FALSE + destroy_surroundings = TRUE + vore_default_mode = DM_DRAIN + vore_digest_chance = 0 + vore_ignores_undigestable = FALSE + armor = list( + "melee" = 5, + "bullet" = 5, + "laser" = 5, + "energy" = 5, + "bomb" = 0, + "bio" = 100, + "rad" = 100) + + eye_desc = "green eyes" + stalker = TRUE + vore_stomach_flavor = "You slip passed pointy triangle teeth and down the slick, slippery gullet \ + of the creature. It's warm, and the air is thick. You can hear its body squelch and shift around you \ + as you settle into its stomach! The doughy walls within cling to you heavily, churning down on you, wearing \ + you out!! There doesn’t appear to be any actual danger here, harmless slime clings to you, but it’s getting \ + harder and harder to move as those walls press in on you insistently!" + + player_msg = "Your kind rarely ventures into realspace. Being in any well-lit area is very taxing on you, but you \ + have more experience than your yellow-eyed cousins. You gain energy decently fast in any very dark area. You're weaker than other \ + shadekin, but your slight energy generation constnatly, and especially in the dark allows for a good mix of uses." + +/mob/living/simple_animal/shadekin/green/white + icon_state = "white" +/mob/living/simple_animal/shadekin/green/dark + icon_state = "dark" +/mob/living/simple_animal/shadekin/green/brown + icon_state = "brown" + +///////////////////////////////////////////////////////////////// +/mob/living/simple_animal/shadekin/orange + name = "orange-eyed shadekin" + eye_state = ORANGE_EYES + health = 175 + hostile = TRUE + retaliate = TRUE + stop_when_pulled = FALSE + destroy_surroundings = TRUE + armor = list( + "melee" = 20, + "bullet" = 15, + "laser" = 15, + "energy" = 25, + "bomb" = 10, + "bio" = 100, + "rad" = 100) + + eye_desc = "orange eyes" + + vore_stomach_flavor = "You slip passed pointy triangle teeth and down the slick, \ + slippery gullet of the creature. It's warm, and the air is thick. You can hear \ + its body squelch and shift around you as you settle into its stomach! Thick digestive \ + enzymes cling to you within that dark space, tingling and stinging immediately! The weight of \ + the doughy walls press in around you instantly, churning you up as you begin to digest!" + + player_msg = "You usually hunt for energy to fuel yourself, though not as often as your red-eyed cousins. \ + You're stronger than most shadekin, faster, and more capable in a brawl, but you don't generate much of your own energy. \ + You can stand in a dark spot to gather some energy, but otherwise need to take it, by force if necessary." + +/mob/living/simple_animal/shadekin/orange/white + icon_state = "white" +/mob/living/simple_animal/shadekin/orange/dark + icon_state = "dark" +/mob/living/simple_animal/shadekin/orange/brown + icon_state = "brown" + ///////////////////////////////////////////////////////////////// //Fluffy specific fluffer /mob/living/simple_animal/shadekin/blue/rivyr diff --git a/icons/mob/vore_shadekin.dmi b/icons/mob/vore_shadekin.dmi index 88852946e37..0e1fcc96d96 100644 Binary files a/icons/mob/vore_shadekin.dmi and b/icons/mob/vore_shadekin.dmi differ