From febabf8899eb79c3fa89d335fa63322899894b4d Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 30 Aug 2019 15:53:16 +0300 Subject: [PATCH] Actually fixes icon scaling on later byond versions -Fixes the missing KEEP_TOGETHER flag required for overlay scaling in the newer versions. -Fixes it for all atoms, not just mobs that have gone through vore setup. Literally nothing needs mismatched overlay scaling. -Fixes the toggle scaling mode verb having been made to toggle the inheritance flag as well for no fucking reason what the hell. -Actually tested working before pushing. --- code/game/atoms_movable.dm | 2 +- code/modules/client/preference_setup/vore/02_size.dm | 1 - code/modules/vore/eating/living_vr.dm | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index adaabce442..c8f0b44c3d 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -1,6 +1,6 @@ /atom/movable layer = OBJ_LAYER - appearance_flags = TILE_BOUND|PIXEL_SCALE + appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER //VOREStation Edit var/last_move = null var/anchored = 0 // var/elevation = 2 - not used anywhere diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index dcccf64ae0..2fe8b54e98 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -46,7 +46,6 @@ character.weight_loss = pref.weight_loss character.fuzzy = pref.fuzzy character.appearance_flags -= pref.fuzzy*PIXEL_SCALE - character.appearance_flags |= KEEP_TOGETHER character.resize(pref.size_multiplier, animate = FALSE) /datum/category_item/player_setup_item/vore/size/content(var/mob/user) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index f372ebe37d..8c5f15f741 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -658,7 +658,6 @@ set category = "Preferences" set desc = "Switch sharp/fuzzy scaling for current mob." appearance_flags ^= PIXEL_SCALE - appearance_flags ^= KEEP_TOGETHER /mob/living/examine(mob/user, distance, infix, suffix) . = ..(user, distance, infix, suffix)