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

Angry Eyes Compatibility Fix (#10856)

Browse Source
This commit is contained in:
Geeves
2020-12-22 17:18:37 +02:00
committed by GitHub
parent a69c6eca43
commit cd3495bf47
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -277,8 +277,10 @@ There are several things that need to be remembered:
stand_icon = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi',"blank")
var/is_frenzied = FALSE
if(mind?.vampire && (mind.vampire.status & VAMP_FRENZIED))
is_frenzied = TRUE
if(mind)
var/datum/vampire/vampire = mind.antag_datums[MODE_VAMPIRE]
if(vampire && (vampire.status & VAMP_FRENZIED))
is_frenzied = TRUE
var/icon_key = "[species.race_key][g][s_tone][r_skin][g_skin][b_skin][lip_style || "nolips"][!!husk][!!fat][!!hulk][!!skeleton][is_frenzied]"
var/obj/item/organ/internal/eyes/eyes = get_eyes()
if(eyes)

12
code/modules/organs/organ_icon.dm
View File

@@ -59,9 +59,14 @@
cut_overlays()
if(!owner || !owner.species)
return
var/is_frenzied = FALSE
if(owner.mind)
var/datum/vampire/vampire = owner.mind.antag_datums[MODE_VAMPIRE]
if(vampire && (vampire.status & VAMP_FRENZIED))
is_frenzied = TRUE
if(owner.species.has_organ[owner.species.vision_organ])
var/obj/item/organ/internal/eyes/eyes = owner.get_eyes()
if(eyes && species.eyes && !(owner.mind?.vampire && (owner.mind.vampire.status & VAMP_FRENZIED)))
if(eyes && species.eyes && !is_frenzied)
var/eyecolor
if (eyes.eye_colour)
eyecolor = rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3])
@@ -101,7 +106,10 @@
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))
if(!H.mind)
return
var/datum/vampire/vampire = H.mind.antag_datums[MODE_VAMPIRE]
if(vampire && (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)