cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5852 from Sharkmare/patch-9

Browse Source 
Make water safe to enter in walk for aquatics
This commit is contained in:
Razgriz
2023-03-05 12:17:22 -07:00
committed by GitHub
parent d86f205862 d5404dfe9b
commit bcd24d365d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/turfs/simulated/water.dm
View File

@@ -29,11 +29,11 @@
handle_fish()
// soundloop = new(list(src), FALSE) // CHOMPEdit: Removing soundloop for now.
// soundloop.start() // CHOMPEdit: Removing soundloop for now.
/turf/simulated/floor/water/Destroy()
// soundloop.stop() // CHOMPEdit: Removing soundloop for now.
// QDEL_NULL(soundloop) // CHOMPEdit: Removing soundloop for now.
. = ..()
/turf/simulated/floor/water/update_icon()
@@ -201,6 +201,12 @@ var/list/shoreline_icon_cache = list()
add_overlay(shoreline_icon_cache[cache_string])
/turf/simulated/floor/water/is_safe_to_enter(mob/living/L)
//CHOMPEDIT: Aquatic flags simulated water as safe now
if(istype(L,/mob/living/carbon))
var /mob/living/carbon/A = L
if(/datum/trait/positive/aquatic in A.species.traits)
return TRUE
//CHOMPEDIT: Aquatic flags simulated water as safe now
if(L.get_water_protection() < 1)
return FALSE
return ..()