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

Merge pull request #7335 from Cerebulon/blurSprites

Browse Source 
Attempts to fix blurry icon scaling
This commit is contained in:
Atermonera
2020-07-15 11:34:56 -07:00
committed by VirgoBot
parent bf40ae3c92
commit e5265d43d9
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/game/atoms_movable.dm
View File

@@ -1,6 +1,6 @@
/atom/movable /atom/movable
layer = OBJ_LAYER layer = OBJ_LAYER
appearance_flags = TILE_BOUND|PIXEL_SCALE appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER
glide_size = 8 glide_size = 8
var/last_move = null //The direction the atom last moved var/last_move = null //The direction the atom last moved
var/anchored = 0 var/anchored = 0
@@ -24,7 +24,7 @@
var/datum/riding/riding_datum = null var/datum/riding/riding_datum = null
var/does_spin = TRUE // Does the atom spin when thrown (of course it does :P) var/does_spin = TRUE // Does the atom spin when thrown (of course it does :P)
var/movement_type = NONE var/movement_type = NONE
var/cloaked = FALSE //If we're cloaked or not var/cloaked = FALSE //If we're cloaked or not
var/image/cloaked_selfimage //The image we use for our client to let them see where we are var/image/cloaked_selfimage //The image we use for our client to let them see where we are
@@ -107,7 +107,7 @@
glide_for(movetime) glide_for(movetime)
loc = newloc loc = newloc
. = TRUE . = TRUE
// So objects can be informed of z-level changes // So objects can be informed of z-level changes
if (old_z != dest_z) if (old_z != dest_z)
onTransitZ(old_z, dest_z) onTransitZ(old_z, dest_z)
@@ -133,7 +133,7 @@
var/atom/movable/thing = i var/atom/movable/thing = i
// We don't call parent so we are calling this for byond // We don't call parent so we are calling this for byond
thing.Crossed(src) thing.Crossed(src)
// We're a multi-tile object (multiple locs) // We're a multi-tile object (multiple locs)
else if(. && newloc) else if(. && newloc)
. = doMove(newloc) . = doMove(newloc)
@@ -282,7 +282,7 @@
glide_for(movetime) glide_for(movetime)
last_move = isnull(direction) ? 0 : direction last_move = isnull(direction) ? 0 : direction
loc = destination loc = destination
// Unset this in case it was set in some other proc. We're no longer moving diagonally for sure. // Unset this in case it was set in some other proc. We're no longer moving diagonally for sure.
moving_diagonally = 0 moving_diagonally = 0
@@ -294,27 +294,27 @@
// If it's not the same area, Exited() it // If it's not the same area, Exited() it
if(old_area && old_area != destarea) if(old_area && old_area != destarea)
old_area.Exited(src, destination) old_area.Exited(src, destination)
// Uncross everything where we left // Uncross everything where we left
for(var/i in oldloc) for(var/i in oldloc)
var/atom/movable/AM = i var/atom/movable/AM = i
if(AM == src) if(AM == src)
continue continue
AM.Uncrossed(src) AM.Uncrossed(src)
// Information about turf and z-levels for source and dest collected // Information about turf and z-levels for source and dest collected
var/turf/oldturf = get_turf(oldloc) var/turf/oldturf = get_turf(oldloc)
var/turf/destturf = get_turf(destination) var/turf/destturf = get_turf(destination)
var/old_z = (oldturf ? oldturf.z : null) var/old_z = (oldturf ? oldturf.z : null)
var/dest_z = (destturf ? destturf.z : null) var/dest_z = (destturf ? destturf.z : null)
// So objects can be informed of z-level changes // So objects can be informed of z-level changes
if (old_z != dest_z) if (old_z != dest_z)
onTransitZ(old_z, dest_z) onTransitZ(old_z, dest_z)
// Destination atom Entered // Destination atom Entered
destination.Entered(src, oldloc) destination.Entered(src, oldloc)
// Entered() the new area if it's not the same area // Entered() the new area if it's not the same area
if(destarea && old_area != destarea) if(destarea && old_area != destarea)
destarea.Entered(src, oldloc) destarea.Entered(src, oldloc)
@@ -366,7 +366,7 @@
glide_size = initial(glide_size) glide_size = initial(glide_size)
else else
glide_size = initial(glide_size) glide_size = initial(glide_size)
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
//called when src is thrown into hit_atom //called when src is thrown into hit_atom
@@ -623,7 +623,7 @@
/atom/movable/proc/cloak_animation(var/length = 1 SECOND) /atom/movable/proc/cloak_animation(var/length = 1 SECOND)
//Save these //Save these
var/initial_alpha = alpha var/initial_alpha = alpha
//Animate alpha fade //Animate alpha fade
animate(src, alpha = 0, time = length) animate(src, alpha = 0, time = length)

1
interface/skin.dmf
View File

@@ -1194,6 +1194,7 @@ window "mapwindow"
text-color = none text-color = none
is-default = true is-default = true
saved-params = "icon-size" saved-params = "icon-size"
zoom-mode = "distort"
on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\"" on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\""
on-hide = ".winset\"mainwindow.mainvsplit.left=\"" on-hide = ".winset\"mainwindow.mainvsplit.left=\""