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

[MIRROR] Soggy Shadekin Fixes (#11302)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-08-04 16:12:16 -07:00
committed by GitHub
parent 7973df9bbb
commit dc9209f71b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,6 +106,8 @@
/turf/simulated/floor/water/Entered(atom/movable/AM, atom/oldloc) /turf/simulated/floor/water/Entered(atom/movable/AM, atom/oldloc)
if(isliving(AM)) if(isliving(AM))
var/mob/living/L = AM var/mob/living/L = AM
if(L.hovering || L.flying || L.is_incorporeal())
return
L.update_water() L.update_water()
if(L.check_submerged() <= 0) if(L.check_submerged() <= 0)
return return
@@ -117,6 +119,8 @@
/turf/simulated/floor/water/Exited(atom/movable/AM, atom/newloc) /turf/simulated/floor/water/Exited(atom/movable/AM, atom/newloc)
if(isliving(AM)) if(isliving(AM))
var/mob/living/L = AM var/mob/living/L = AM
if(L.hovering || L.flying || L.is_incorporeal())
return
L.update_water() L.update_water()
if(L.check_submerged() <= 0) if(L.check_submerged() <= 0)
return return
@@ -164,7 +168,7 @@
/mob/living/proc/check_submerged() /mob/living/proc/check_submerged()
if(buckled) if(buckled)
return 0 return 0
if(hovering || flying) if(hovering || flying || is_incorporeal())
if(flying) if(flying)
adjust_nutrition(-0.5) adjust_nutrition(-0.5)
return 0 return 0

2
code/modules/mob/living/simple_mob/simple_mob.dm
View File

@@ -278,7 +278,7 @@
// Turf related slowdown // Turf related slowdown
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
if(T && T.movement_cost && (!hovering || !flying)) // Flying mobs ignore turf-based slowdown. Aquatic mobs ignore water slowdown, and can gain bonus speed in it. if(T && T.movement_cost && !(hovering || flying || is_incorporeal())) // Flying mobs ignore turf-based slowdown. Aquatic mobs ignore water slowdown, and can gain bonus speed in it.
if(istype(T,/turf/simulated/floor/water) && aquatic_movement) if(istype(T,/turf/simulated/floor/water) && aquatic_movement)
. -= aquatic_movement - 1 . -= aquatic_movement - 1
else else