cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Item hover outline FX (#4090)

Browse Source 
* Revert "[MODULAR] Adds item outline glow (#3861)"

This reverts commit 9ea4373618.

* ..

Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-03-12 22:44:54 +00:00
committed by GitHub
co-authored by Useroth
parent d2ee8bc02a
commit 391f1d2552
12 changed files with 79 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+7 -1
View File
@@ -114,6 +114,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/screentip_pref = TRUE
///Color of screentips at top of screen
var/screentip_color = "#ffd391"
///Do we show item hover outlines?
var/itemoutline_pref = TRUE
var/ambientocclusion = TRUE
///Should we automatically fit the viewport?
@@ -644,7 +646,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<b>Set screentip mode:</b> <a href='?_src_=prefs;preference=screentipmode'>[screentip_pref ? "Enabled" : "Disabled"]</a><br>"
dat += "<b>Screentip color:</b><span style='border: 1px solid #161616; background-color: [screentip_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=screentipcolor'>Change</a><BR>"
dat += "<b>Item Hover Outlines:</b> <a href='?_src_=prefs;preference=itemoutline_pref'>[itemoutline_pref ? "Enabled" : "Disabled"]</a><br>"
dat += "<b>Ambient Occlusion:</b> <a href='?_src_=prefs;preference=ambientocclusion'>[ambientocclusion ? "Enabled" : "Disabled"]</a><br>"
dat += "<b>Fit Viewport:</b> <a href='?_src_=prefs;preference=auto_fit_viewport'>[auto_fit_viewport ? "Auto" : "Manual"]</a><br>"
@@ -1844,6 +1847,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(new_screentipcolor)
screentip_color = sanitize_ooccolor(new_screentipcolor)
if("itemoutline_pref")
itemoutline_pref = !itemoutline_pref
if("ambientocclusion")
ambientocclusion = !ambientocclusion
if(parent?.screen && parent.screen.len)
code/modules/client/preferences_savefile.dm
+3
View File
@@ -198,6 +198,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
READ_FILE(S["parallax"], parallax)
READ_FILE(S["ambientocclusion"], ambientocclusion)
READ_FILE(S["screentip_pref"], screentip_pref)
READ_FILE(S["itemoutline_pref"], itemoutline_pref)
READ_FILE(S["auto_fit_viewport"], auto_fit_viewport)
READ_FILE(S["widescreenpref"], widescreenpref)
READ_FILE(S["pixel_size"], pixel_size)
@@ -248,6 +249,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
parallax = sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null)
ambientocclusion = sanitize_integer(ambientocclusion, FALSE, TRUE, initial(ambientocclusion))
screentip_pref = sanitize_integer(screentip_pref, FALSE, TRUE, initial(screentip_pref))
itemoutline_pref = sanitize_integer(itemoutline_pref, FALSE, TRUE, initial(itemoutline_pref))
auto_fit_viewport = sanitize_integer(auto_fit_viewport, FALSE, TRUE, initial(auto_fit_viewport))
widescreenpref = sanitize_integer(widescreenpref, FALSE, TRUE, initial(widescreenpref))
pixel_size = sanitize_float(pixel_size, PIXEL_SCALING_AUTO, PIXEL_SCALING_3X, 0.5, initial(pixel_size))
@@ -327,6 +329,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["parallax"], parallax)
WRITE_FILE(S["ambientocclusion"], ambientocclusion)
WRITE_FILE(S["screentip_pref"], screentip_pref)
WRITE_FILE(S["itemoutline_pref"], itemoutline_pref)
WRITE_FILE(S["auto_fit_viewport"], auto_fit_viewport)
WRITE_FILE(S["widescreenpref"], widescreenpref)
WRITE_FILE(S["pixel_size"], pixel_size)