diff --git a/code/modules/mob/living/simple_animal/vore/badboi.dm b/code/modules/mob/living/simple_animal/vore/badboi.dm index 7a48eed575..1513db2550 100644 --- a/code/modules/mob/living/simple_animal/vore/badboi.dm +++ b/code/modules/mob/living/simple_animal/vore/badboi.dm @@ -47,6 +47,7 @@ max_n2 = 0 minbodytemp = 150 maxbodytemp = 900 + var/image/eye_layer = null vore_active = TRUE vore_capacity = 1 @@ -87,7 +88,29 @@ return EatTarget() else ..() +/mob/living/simple_animal/hostile/badboi/proc/add_eyes() + if(!eye_layer) + eye_layer = image(icon, "badboi-eyes") + eye_layer.plane = PLANE_LIGHTING_ABOVE + modifier_overlay = eye_layer + overlays += eye_layer + +/mob/living/simple_animal/hostile/badboi/proc/remove_eyes() + overlays -= eye_layer + +/mob/living/simple_animal/hostile/badboi/New() + add_eyes() + ..() + /mob/living/simple_animal/hostile/badboi/death(gibbed, deathmessage = "shudders and collapses!") .=..() + remove_eyes() resting = 0 icon_state = icon_dead + +/mob/living/simple_animal/hostile/badboi/lay_down() + ..() + if(resting) + remove_eyes() + else + add_eyes() \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/vore/otie.dm b/code/modules/mob/living/simple_animal/vore/otie.dm index 766ed7a4ae..6b55c32a93 100644 --- a/code/modules/mob/living/simple_animal/vore/otie.dm +++ b/code/modules/mob/living/simple_animal/vore/otie.dm @@ -46,6 +46,9 @@ pixel_x = -16 pixel_y = 0 + var/glowyeyes = FALSE + var/image/eye_layer = null + var/eyetype var/mob/living/carbon/human/friend var/tamed = 0 var/tame_chance = 50 //It's a fiddy-fiddy default you may get a buddy pal or you may get mauled and ate. Win-win! @@ -78,6 +81,8 @@ max_co2 = 0 min_n2 = 0 max_n2 = 0 + glowyeyes = TRUE + eyetype = "photie" /mob/living/simple_animal/otie/friendly //gets the pet2tame feature and doesn't kill you right away name = "otie" @@ -109,6 +114,8 @@ max_co2 = 0 min_n2 = 0 max_n2 = 0 + glowyeyes = TRUE + eyetype = "photie" /mob/living/simple_animal/otie/security //tame by default unless you're a marked crimester. can be befriended to follow with pets tho. name = "guard otie" @@ -121,6 +128,8 @@ maxHealth = 200 //armored or something health = 200 tamed = 1 + glowyeyes = TRUE + eyetype = "sotie" loot_list = list(/obj/item/clothing/glasses/sunglasses/sechud,/obj/item/clothing/suit/armor/vest/alt) vore_pounce_chance = 60 // Good boys don't do too much police brutality. @@ -144,6 +153,8 @@ max_co2 = 0 min_n2 = 0 max_n2 = 0 + glowyeyes = TRUE + eyetype = "sotie" /mob/living/simple_animal/otie/PunchTarget() if(istype(target_mob,/mob/living/simple_animal/mouse)) @@ -315,7 +326,32 @@ else ..() +/mob/living/simple_animal/otie/proc/add_eyes() + if(!eye_layer) + eye_layer = image(icon, "[eyetype]-eyes") + eye_layer.plane = PLANE_LIGHTING_ABOVE + modifier_overlay = eye_layer + overlays += eye_layer + +/mob/living/simple_animal/otie/proc/remove_eyes() + overlays -= eye_layer + +/mob/living/simple_animal/otie/New() + if(glowyeyes) + add_eyes() + ..() + +/mob/living/simple_animal/otie/lay_down() + ..() + if(glowyeyes) + if(resting) + remove_eyes() + else + add_eyes() + /mob/living/simple_animal/otie/death(gibbed, deathmessage = "dies!") + if(glowyeyes) + remove_eyes() resting = 0 icon_state = icon_dead update_icon() diff --git a/icons/mob/vore64x32.dmi b/icons/mob/vore64x32.dmi index 8302072f35..1d73c742cb 100644 Binary files a/icons/mob/vore64x32.dmi and b/icons/mob/vore64x32.dmi differ