From 55005c4ac6142c52d5df4f3cce1cf424aafe1c63 Mon Sep 17 00:00:00 2001 From: Raeschen Date: Tue, 9 Apr 2024 22:32:52 +0200 Subject: [PATCH] Tweaks aquatic behavior (#8195) --- code/modules/mob/_modifiers/modifiers_vr.dm | 4 ++-- code/modules/mob/living/carbon/human/human_movement.dm | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/_modifiers/modifiers_vr.dm b/code/modules/mob/_modifiers/modifiers_vr.dm index 2de03120d4..de156b2803 100644 --- a/code/modules/mob/_modifiers/modifiers_vr.dm +++ b/code/modules/mob/_modifiers/modifiers_vr.dm @@ -55,7 +55,7 @@ stacks = MODIFIER_STACK_FORBID - slowdown = -1.5 //A bit faster when actually submerged fully in water, as you're not waddling through it. + slowdown = -1.0 //A bit faster when actually submerged fully in water, as you're not waddling through it. //ChompEDIT - nerf this a lil siemens_coefficient = 1.5 //You are, however, underwater. Getting shocked will hurt. outgoing_melee_damage_percent = 0.75 //You are swinging a sword under water...Good luck. @@ -332,4 +332,4 @@ max_hal_resistance = 0 min_hal_resistance = 0 - effective_hal_resistance = 1 \ No newline at end of file + effective_hal_resistance = 1 diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index e88064ebad..3438bc9f8d 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -154,7 +154,8 @@ var/turf_move_cost = T.movement_cost if(istype(T, /turf/simulated/floor/water)) if(species.water_movement) - turf_move_cost = CLAMP(turf_move_cost + species.water_movement, HUMAN_LOWEST_SLOWDOWN, 15) + //turf_move_cost = CLAMP(turf_move_cost + species.water_movement, HUMAN_LOWEST_SLOWDOWN, 15) //ChompEDIT - all water is free movement for aquatics + turf_move_cost = 0 //ChompEDIT - all water is free movement for aquatics if(istype(shoes, /obj/item/clothing/shoes)) //CHOMPEdit - Fixes runtime var/obj/item/clothing/shoes/feet = shoes if(istype(feet) && feet.water_speed)