cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up and use more sane defaults.

Browse Source
This commit is contained in:
JimTheCactus
2014-07-31 22:17:26 -06:00
parent 718b94fa3a
commit e02cfbec8c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/__HELPERS/icons.dm
View File

@@ -635,7 +635,7 @@ The _flatIcons list is a cache for generated icon files.
*/ */
proc // Creates a single icon from a given /atom or /image. Only the first argument is required. proc // Creates a single icon from a given /atom or /image. Only the first argument is required.
getFlatIcon(image/A, defdir=2, deficon=null, defstate=null, defblend=null) getFlatIcon(image/A, defdir=2, deficon=null, defstate="", defblend=BLEND_DEFAULT)
// We start with a blank canvas, otherwise some icon procs crash silently // We start with a blank canvas, otherwise some icon procs crash silently
var/icon/flat = icon('icons/effects/effects.dmi', "icon_state"="nothing") // Final flattened icon var/icon/flat = icon('icons/effects/effects.dmi', "icon_state"="nothing") // Final flattened icon
if(!A) if(!A)
@@ -672,13 +672,10 @@ proc // Creates a single icon from a given /atom or /image. Only the first argu
curdir = defdir curdir = defdir
var/curblend var/curblend
if(A.blend_mode) if(A.blend_mode == BLEND_DEFAULT)
if(A.blend_mode == BLEND_DEFAULT)
curblend = defblend
else
curblend = A.blend_mode
else
curblend = defblend curblend = defblend
else
curblend = A.blend_mode
// Layers will be a sorted list of icons/overlays, based on the order in which they are displayed // Layers will be a sorted list of icons/overlays, based on the order in which they are displayed
var/list/layers = list() var/list/layers = list()