Skip to content

Commit

Permalink
Actually fixes MA issue w ifdefs (tgstation#86579)
Browse files Browse the repository at this point in the history
## About The Pull Request

I FORGOT TO COMMIT AHHHH

tgstation#86538 WAS JUST THE REMOVAL
  • Loading branch information
LemonInTheDark authored Sep 10, 2024
1 parent c24dcb6 commit 56d06ad
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions code/modules/admin/view_variables/debug_variable_appearance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
// can't use the name either for byond reasons
var/_vis_flags

#if (MIN_COMPILER_VERSION > 515 || MIN_COMPILER_BUILD > 1643)
#warn vis_flags should now be supported by mutable appearances so we can safely remove the weird copying in this code
#endif
// all alone at the end of the universe
GLOBAL_DATUM_INIT(pluto, /atom/movable, new /atom/movable(null))

Expand All @@ -63,6 +66,28 @@ GLOBAL_DATUM_INIT(pluto, /atom/movable, new /atom/movable(null))
return FALSE
if(var_name == NAMEOF(src, realized_underlays))
return FALSE

#if (MIN_COMPILER_VERSION >= 515 && MIN_COMPILER_BUILD >= 1643)
#warn X/Y/Z and contents are now fully unviewable on our supported versions, remove the below check
#endif

// lummy removed these from the the MA/image type
#if (DM_VERSION <= 515 && DM_BUILD < 1643)
// Filtering out the stuff I know we don't care about
if(var_name == NAMEOF(src, x))
return FALSE
if(var_name == NAMEOF(src, y))
return FALSE
if(var_name == NAMEOF(src, z))
return FALSE
#ifndef SPACEMAN_DMM // Spaceman doesn't believe in contents on appearances, sorry lads
if(var_name == NAMEOF(src, contents))
return FALSE
#endif
if(var_name == NAMEOF(src, loc))
return FALSE
#endif
// Could make an argument for this but I think they will just confuse people, so yeeet
if(var_name == NAMEOF(src, vis_contents))
return FALSE
return ..()
Expand Down

0 comments on commit 56d06ad

Please sign in to comment.