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

Update SSOverlays (ported from Baystation) (#19051)

Browse Source 
Our SSOverlays system is outdated, and is likely the cause of many of
the issues seen in #18895. It has also been linked to a massive server
performance decrease.

This brings an updated system from Baystation, hopefully with speed
increases.

Should be testmerged, ideally with #18895.

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
This commit is contained in:
Cody Brittain
2024-05-01 03:46:27 -04:00
committed by GitHub
parent 405a05b819
commit 9983fca311
350 changed files with 1626 additions and 1498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_icon.dm
+11 -11
View File
@@ -2,14 +2,14 @@
return
/obj/item/organ/external/proc/compile_icon()
cut_overlays()
ClearOverlays()
// This is a kludge, only one icon has more than one generation of children though.
for(var/obj/item/organ/external/organ in contents)
if(organ.children && organ.children.len)
for(var/obj/item/organ/external/child in organ.children)
add_overlay(child.mob_icon)
AddOverlays(child.mob_icon)
add_overlay(organ.mob_icon)
AddOverlays(organ.mob_icon)
/obj/item/organ/external/proc/sync_colour_to_human(var/mob/living/carbon/human/human)
s_tone = null
@@ -50,7 +50,7 @@
/obj/item/organ/external/head/get_icon()
..()
cut_overlays()
ClearOverlays()
if(!owner || !owner.species)
return
var/is_frenzied = FALSE
@@ -78,7 +78,7 @@
SSicon_cache.human_eye_cache[cache_key] = eyes_icon
mob_icon.Blend(eyes_icon, ICON_OVERLAY)
add_overlay(eyes_icon)
AddOverlays(eyes_icon)
if(owner.lipstick_color && (species && (species.appearance_flags & HAS_LIPS)))
var/icon/lip_icon = SSicon_cache.human_lip_cache["[owner.lipstick_color]"]
@@ -87,16 +87,16 @@
lip_icon.Blend(owner.lipstick_color, species.eyes_icon_blend)
SSicon_cache.human_lip_cache["[owner.lipstick_color]"] = lip_icon
add_overlay(lip_icon)
AddOverlays(lip_icon)
mob_icon.Blend(lip_icon, ICON_OVERLAY)
apply_markings()
get_internal_organs_overlay()
add_overlay(owner.generate_hair_icon())
AddOverlays(owner.generate_hair_icon())
compile_overlays()
UpdateOverlays()
return mob_icon
@@ -130,7 +130,7 @@
finished_icon.Blend(m_color, mark_style.icon_blend_mode)
SSicon_cache.markings_cache[cache_key] = finished_icon
add_overlay(finished_icon) //So when it's not on your body, it has icons
AddOverlays(finished_icon) //So when it's not on your body, it has icons
mob_icon.Blend(finished_icon, ICON_OVERLAY) //So when it's on your body, it has icons
/obj/item/organ/external/proc/get_internal_organs_overlay()
@@ -147,7 +147,7 @@
organ_icon = new /icon(internal_organ_icon, O.item_state || O.icon_state)
SSicon_cache.internal_organ_cache[cache_key] = organ_icon
add_overlay(organ_icon)
AddOverlays(organ_icon)
mob_icon.Blend(organ_icon, ICON_OVERLAY)
/obj/item/organ/external/var/icon_cache_key
@@ -230,7 +230,7 @@
/obj/item/organ/external/proc/cut_additional_images(var/mob/living/carbon/human/H)
if(LAZYLEN(additional_images))
H.cut_overlay(additional_images, TRUE)
H.CutOverlays(additional_images, ATOM_ICON_CACHE_PROTECTED)
LAZYCLEARLIST(additional_images)
// new damage icon system