mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-07-12 07:32:33 +01:00
Merge pull request #3571 from Verkister/lucidumb
Adds glowy eyes to badbois and sec/phoron oties.
This commit is contained in:
@@ -48,6 +48,9 @@
|
||||
minbodytemp = 150
|
||||
maxbodytemp = 900
|
||||
|
||||
var/image/eye_layer = null
|
||||
|
||||
|
||||
vore_active = TRUE
|
||||
vore_capacity = 1
|
||||
vore_pounce_chance = 15
|
||||
@@ -87,7 +90,26 @@
|
||||
return EatTarget()
|
||||
else ..()
|
||||
|
||||
/mob/living/simple_animal/hostile/corrupthound/proc/add_eyes()
|
||||
if(!eye_layer)
|
||||
eye_layer = image(icon, "badboi-eyes")
|
||||
eye_layer.plane = PLANE_LIGHTING_ABOVE
|
||||
add_overlay(eye_layer)
|
||||
|
||||
/mob/living/simple_animal/hostile/corrupthound/proc/remove_eyes()
|
||||
cut_overlay(eye_layer)
|
||||
|
||||
/mob/living/simple_animal/hostile/corrupthound/New()
|
||||
add_eyes()
|
||||
..()
|
||||
|
||||
/mob/living/simple_animal/hostile/corrupthound/death(gibbed, deathmessage = "shudders and collapses!")
|
||||
.=..()
|
||||
resting = 0
|
||||
icon_state = icon_dead
|
||||
|
||||
/mob/living/simple_animal/hostile/corrupthound/update_icon()
|
||||
. = ..()
|
||||
remove_eyes()
|
||||
if(stat == CONSCIOUS && !resting)
|
||||
add_eyes()
|
||||
|
||||
@@ -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,8 +326,27 @@
|
||||
else
|
||||
..()
|
||||
|
||||
/mob/living/simple_animal/otie/death(gibbed, deathmessage = "dies!")
|
||||
resting = 0
|
||||
icon_state = icon_dead
|
||||
update_icon()
|
||||
/mob/living/simple_animal/otie/proc/add_eyes()
|
||||
if(!eye_layer)
|
||||
eye_layer = image(icon, "[eyetype]-eyes")
|
||||
eye_layer.plane = PLANE_LIGHTING_ABOVE
|
||||
add_overlay(eye_layer)
|
||||
|
||||
/mob/living/simple_animal/otie/proc/remove_eyes()
|
||||
cut_overlay(eye_layer)
|
||||
|
||||
/mob/living/simple_animal/otie/New()
|
||||
if(glowyeyes)
|
||||
add_eyes()
|
||||
..()
|
||||
|
||||
/mob/living/simple_animal/otie/update_icon()
|
||||
. = ..()
|
||||
remove_eyes()
|
||||
if(glowyeyes && stat == CONSCIOUS && !resting)
|
||||
add_eyes()
|
||||
|
||||
/mob/living/simple_animal/otie/death(gibbed, deathmessage = "dies!")
|
||||
.=..()
|
||||
resting = 0
|
||||
icon_state = icon_dead
|
||||
Reference in New Issue
Block a user