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

VueUI Vending Machines III: Revenge of the Spritesheets (#10311)

Browse Source 
It's #10197 and #10240 again, except this time using spritesheets from #10272.

Also fixes issues with coin interactions / premium items, and some other minor tweaks.
This commit is contained in:
JohnWildkins
2020-10-31 05:00:28 -04:00
committed by GitHub
parent edecd6128e
commit cbf8930bb7
9 changed files with 486 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/_helpers/icons.dm
View File

@@ -769,12 +769,16 @@ proc/ColorTone(rgb, tone)
var/list/flat_size = list(1, flat.Width(), 1, flat.Height())
// Dimensions of overlay being added
var/list/add_size[4]
var/blend_color = A.color ? TRUE : FALSE
for(var/V in layers)
var/image/I = V
if(I.alpha == 0)
continue
if(blend_color && I.appearance_flags == RESET_COLOR)
blend_color = FALSE
if(I == copy) // 'I' is an /image based on the object being flattened.
curblend = BLEND_OVERLAY
add = icon(I.icon, I.icon_state, base_icon_dir)
@@ -803,7 +807,7 @@ proc/ColorTone(rgb, tone)
// Blend the overlay into the flattened icon
flat.Blend(add, blendMode2iconMode(curblend), I.pixel_x + 2 - flatX1, I.pixel_y + 2 - flatY1)
if(A.color)
if(A.color && blend_color)
if(islist(A.color))
flat.MapColors(arglist(A.color))
else