mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 07:38:05 +01:00
Revert "Fixes Photos more cheaply" (#19568)
This commit is contained in:
+2
-12
@@ -692,11 +692,7 @@ The _flatIcons list is a cache for generated icon files.
|
||||
var/image/copy
|
||||
// Add the atom's icon itself, without pixel_x/y offsets.
|
||||
if(!noIcon)
|
||||
var/icon/copyicon = icon(curicon, curstate, dir=curdir)
|
||||
if(IsBlankIcon(copyicon))
|
||||
curdir = SOUTH
|
||||
copy = image(icon=curicon, icon_state=curstate, layer=A.layer)
|
||||
copy.dir = curdir
|
||||
copy = image(icon=curicon, icon_state=curstate, layer=A.layer, dir=curdir)
|
||||
copy.color = A.color
|
||||
copy.alpha = A.alpha
|
||||
copy.blend_mode = curblend
|
||||
@@ -919,12 +915,6 @@ var/global/list/friendly_animal_types = list()
|
||||
final_average = BlendRGB(final_average, colour, 1)
|
||||
return final_average
|
||||
|
||||
/proc/IsBlankIcon(icon/I)
|
||||
for(var/y_pixel = 1 to I.Height())
|
||||
for(var/x_pixel = 1 to I.Width())
|
||||
if(I.GetPixel(x_pixel, y_pixel))
|
||||
return 0
|
||||
return 1
|
||||
|
||||
//Interface for using DrawBox() to draw 1 pixel on a coordinate.
|
||||
//Returns the same icon specifed in the argument, but with the pixel drawn
|
||||
@@ -1016,4 +1006,4 @@ var/global/list/humanoid_icon_cache = list()
|
||||
//Images have dir without being an atom, so they get their own definition.
|
||||
//Lame.
|
||||
/image/proc/setDir(newdir)
|
||||
dir = newdir
|
||||
dir = newdir
|
||||
|
||||
@@ -258,9 +258,9 @@
|
||||
holding = "They are holding \a [L.r_hand]"
|
||||
|
||||
if(!mob_detail)
|
||||
mob_detail = "You can see [L] on the photo[L.health < (0.75 * L.maxHealth) ? " - [L] looks hurt":""].[holding ? " [holding]":"."]. "
|
||||
mob_detail = "You can see [L] on the photo[L.health < 75 ? " - [L] looks hurt":""].[holding ? " [holding]":"."]. "
|
||||
else
|
||||
mob_detail += "You can also see [L] on the photo[L.health < (0.75 * L.maxHealth) ? " - [L] looks hurt":""].[holding ? " [holding]":"."]."
|
||||
mob_detail += "You can also see [L] on the photo[L.health < 75 ? " - [L] looks hurt":""].[holding ? " [holding]":"."]."
|
||||
|
||||
|
||||
return mob_detail
|
||||
|
||||
Reference in New Issue
Block a user