From 1db4da34c18c660200b5010ef08bf49edb4f31fe Mon Sep 17 00:00:00 2001 From: Alberyk Date: Tue, 2 Jan 2018 15:06:04 -0200 Subject: [PATCH] Fixes the pool's overlay making impossible to click spessmen inside water (#4004) --- code/game/turfs/simulated/water.dm | 20 +++++++++++++++++++- html/changelogs/alberyk_pool.yml | 6 ++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/alberyk_pool.yml diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index 83f091f8ee7..ef5afab1fcf 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -22,6 +22,7 @@ footstep_sound = "waterstep" movement_cost = 2 var/watertype = "water5" + var/obj/effect/water_effect/water_overlay /turf/simulated/floor/beach/water/pool name = "pool" @@ -38,12 +39,29 @@ icon_state = "abyss" watertype = "seadeep" +/obj/effect/water_effect + name = "water" + icon = 'icons/misc/beach.dmi' + layer = MOB_LAYER+0.1 + opacity = FALSE + anchored = TRUE + mouse_opacity = FALSE + unacidable = TRUE + /turf/simulated/floor/beach/water/update_dirt() return // Water doesn't become dirty /turf/simulated/floor/beach/water/Initialize() . = ..() - add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="[watertype]","layer"=MOB_LAYER+0.1)) + var/obj/effect/water_effect/W = new /obj/effect/water_effect(src) + W.icon_state = watertype + water_overlay = W + +/turf/simulated/floor/beach/water/Destroy() + if(water_overlay) + qdel(water_overlay) + water_overlay = null + return ..() /turf/simulated/floor/beach/water/return_air_for_internal_lifeform(var/mob/living/carbon/L) if(L && L.lying) diff --git a/html/changelogs/alberyk_pool.yml b/html/changelogs/alberyk_pool.yml new file mode 100644 index 00000000000..320b54c3bd3 --- /dev/null +++ b/html/changelogs/alberyk_pool.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "You can now properly click on people and objects that are on water titles, such as the pool."