cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [NO GBP] Visually fixing the aquarium (#26192)

Browse Source 
* [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

🆑
fix: Fixes how the aquarium looks.
/🆑

* [NO GBP] Visually fixing the aquarium

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-01-20 13:56:08 -05:00
committed by GitHub
co-authored by Ghom
parent 85cc1c6acc
commit 9561b81a92
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/fishing/aquarium/aquarium.dm
+7 -7
View File
@@ -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)
. = ..()