cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Angry Eyes (#10787)

Browse Source
This commit is contained in:
Geeves
2020-12-22 15:45:18 +01:00
committed by GitHub
parent 8d0897e401
commit ec6a2c4456
5 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_icon.dm
+10 -1
View File
@@ -61,7 +61,7 @@
return
if(owner.species.has_organ[owner.species.vision_organ])
var/obj/item/organ/internal/eyes/eyes = owner.get_eyes()
if(eyes && species.eyes)
if(eyes && species.eyes && !(owner.mind?.vampire && (owner.mind.vampire.status & VAMP_FRENZIED)))
var/eyecolor
if (eyes.eye_colour)
eyecolor = rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3])
@@ -100,6 +100,12 @@
return mob_icon
/obj/item/organ/external/head/get_additional_images(var/mob/living/carbon/human/H)
if(H.mind?.vampire && (H.mind.vampire.status & VAMP_FRENZIED))
var/image/return_image = image(H.species.eyes_icons, H, "[H.species.eyes]_frenzy", EFFECTS_ABOVE_LIGHTING_LAYER)
return_image.appearance_flags = KEEP_APART
return list(return_image)
/obj/item/organ/external/proc/apply_markings(restrict_to_robotic = FALSE)
if (!cached_markings)
update_marking_cache()
@@ -206,6 +212,9 @@
return mob_icon
/obj/item/organ/external/proc/get_additional_images(var/mob/living/carbon/human/H)
return
// new damage icon system
// adjusted to set damage_state to brute/burn code only (without r_name0 as before)
/obj/item/organ/external/update_icon()