cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 19:42:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modular Computer Screens (#8646)

Browse Source 
Tweaked how computers display and layer their screens, mobs and objects should now properly go under or over them when they should.

This is quite experimental, in testing I found that some of the icons kinda stutter? I'm not sure if that's just my local computer having trouble with it though. I would appreciate it if a few people would download this branch and try it out.
This commit is contained in:
Geeves
2020-05-24 09:25:37 +02:00
committed by GitHub
parent 85e639b8fc
commit fa802a5749
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
code/modules/modular_computers/computers/modular_computer/core.dm
View File

@@ -100,14 +100,17 @@
cut_overlays()
if(damage >= broken_damage)
icon_state = icon_state_broken
add_overlay("broken")
var/mutable_appearance/broken_overlay = mutable_appearance(icon, "broken", layer + 0.1, plane)
add_overlay(broken_overlay)
return
if(!enabled)
if(icon_state_screensaver && working)
if (is_holographic)
holographic_overlay(src, src.icon, icon_state_screensaver)
else
add_overlay(icon_state_screensaver)
var/icon/screensaver_icon = icon(icon, icon_state_screensaver)
if(is_holographic)
var/icon/alpha_mask = new('icons/effects/effects.dmi', "scanline")
screensaver_icon.AddAlphaMask(alpha_mask)
var/mutable_appearance/screensaver_overlay = mutable_appearance(screensaver_icon, pick(screensaver_icon.IconStates()), layer + 0.1, plane)
add_overlay(screensaver_overlay)
if (screensaver_light_range && working)
set_light(screensaver_light_range, 1, screensaver_light_color ? screensaver_light_color : "#FFFFFF")
@@ -116,16 +119,20 @@
return
if(active_program)
var/state = active_program.program_icon_state ? active_program.program_icon_state : icon_state_menu
if (is_holographic)
holographic_overlay(src, src.icon, state)
else
add_overlay(state)
var/icon/state_icon = icon(icon, state)
if(is_holographic)
var/icon/alpha_mask = new('icons/effects/effects.dmi', "scanline")
state_icon.AddAlphaMask(alpha_mask)
var/mutable_appearance/state_overlay = mutable_appearance(state_icon, pick(state_icon.IconStates()), layer + 0.1, plane)
add_overlay(state_overlay)
set_light(light_strength, l_color = active_program.color)
else
if (is_holographic)
holographic_overlay(src, src.icon, icon_state_menu)
else
add_overlay(icon_state_menu)
var/icon/menu_icon = icon(icon, icon_state_menu)
if(is_holographic)
var/icon/alpha_mask = new('icons/effects/effects.dmi', "scanline")
menu_icon.AddAlphaMask(alpha_mask)
var/mutable_appearance/menu_overlay = mutable_appearance(menu_icon, pick(menu_icon.IconStates()), layer + 0.1, plane)
add_overlay(menu_overlay)
set_light(light_strength, l_color = menu_light_color)
/obj/item/modular_computer/proc/turn_on(var/mob/user)