From 8d4d1ffbd17f82c92cf0b87f2dab6bc2b902065d Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sat, 20 Jan 2024 18:49:17 +0100 Subject: [PATCH] [NO GBP] Visually fixing the aquarium (#81000) ## About The Pull Request I removed the `layer` bits like an idiot and now stuff is being rendered under rather than over the base. ## Why It's Good For The Game Title. ## Changelog :cl: fix: Fixes how the aquarium looks. /:cl: --- code/modules/fishing/aquarium/aquarium.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm index 5eb2a7f4374..48c7b8e24e9 100644 --- a/code/modules/fishing/aquarium/aquarium.dm +++ b/code/modules/fishing/aquarium/aquarium.dm @@ -113,17 +113,17 @@ //optional todo: hook up sending surface changed on aquarium changing layers switch(layer_type) if(AQUARIUM_LAYER_MODE_BEHIND_GLASS) - return AQUARIUM_BELOW_GLASS_LAYER + return layer + AQUARIUM_BELOW_GLASS_LAYER if(AQUARIUM_LAYER_MODE_BOTTOM) - return AQUARIUM_MIN_OFFSET + return layer + AQUARIUM_MIN_OFFSET if(AQUARIUM_LAYER_MODE_TOP) - return AQUARIUM_MAX_OFFSET + return layer + AQUARIUM_MAX_OFFSET if(AQUARIUM_LAYER_MODE_AUTO) var/chosen_layer = AQUARIUM_MIN_OFFSET + AQUARIUM_LAYER_STEP while((chosen_layer in used_layers) && (chosen_layer <= AQUARIUM_MAX_OFFSET)) chosen_layer += AQUARIUM_LAYER_STEP used_layers += chosen_layer - return chosen_layer + return layer + chosen_layer /obj/structure/aquarium/proc/free_layer(value) used_layers -= value @@ -149,9 +149,9 @@ var/suffix = fluid_type == AQUARIUM_FLUID_AIR ? "air" : "water" if(broken) suffix += "_broken" - . += mutable_appearance(icon, "aquarium_glass_cracks", layer = AQUARIUM_BORDERS_LAYER) - . += mutable_appearance(icon, "aquarium_glass_[suffix]", layer = AQUARIUM_GLASS_LAYER) - . += mutable_appearance(icon, "aquarium_borders", layer = AQUARIUM_BORDERS_LAYER) + . += mutable_appearance(icon, "aquarium_glass_cracks", layer = layer + AQUARIUM_BORDERS_LAYER) + . += mutable_appearance(icon, "aquarium_glass_[suffix]", layer = layer + AQUARIUM_GLASS_LAYER) + . += mutable_appearance(icon, "aquarium_borders", layer = layer + AQUARIUM_BORDERS_LAYER) /obj/structure/aquarium/examine(mob/user) . = ..()