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

[MIRROR] Climbing/Swimming Trait Tweaks (#9488)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-11-19 10:41:12 -07:00
committed by GitHub
parent 9942e48aeb
commit 6fb99431fa
8 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/multiz/ladders.dm
View File

@@ -107,7 +107,12 @@
target_ladder.audible_message(span_notice("You hear something coming [direction] \the [src]"), runemessage = "clank clank")
if(do_after(M, climb_time, src))
var/climb_modifier = 1
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/MS = M
climb_modifier = MS.species.climb_mult
if(do_after(M, (climb_time * climb_modifier), src))
var/turf/T = get_turf(target_ladder)
for(var/atom/A in T)
if(!A.CanPass(M, M.loc, 1.5, 0))

15
code/modules/multiz/movement.dm
View File

@@ -19,6 +19,13 @@
var/obj/mecha/mech = loc
return mech.relaymove(src,direction)
var/swim_modifier = 1
var/climb_modifier = 1
if(istype(src,/mob/living/carbon/human))
var/mob/living/carbon/human/MS = src
swim_modifier = MS.species.swim_mult
climb_modifier = MS.species.climb_mult
if(!can_ztravel())
to_chat(src, span_warning("You lack means of travel in that direction."))
return
@@ -49,7 +56,7 @@
if(direction == DOWN)
var/turf/simulated/floor/water/deep/ocean/diving/sink = start
if(istype(sink) && !destination.density)
var/pull_up_time = max(3 SECONDS + (src.movement_delay() * 10), 1)
var/pull_up_time = max((3 SECONDS + (src.movement_delay() * 10) * swim_modifier), 1)
to_chat(src, span_notice("You start diving underwater..."))
src.audible_message(span_notice("[src] begins to dive under the water."), runemessage = "splish splosh")
if(do_after(src, pull_up_time))
@@ -75,7 +82,7 @@
var/turf/simulated/floor/water/deep/ocean/diving/surface = destination
if(lattice)
var/pull_up_time = max(5 SECONDS + (src.movement_delay() * 10), 1)
var/pull_up_time = max((5 SECONDS + (src.movement_delay() * 10) * climb_modifier), 1)
to_chat(src, span_notice("You grab \the [lattice] and start pulling yourself upward..."))
src.audible_message(span_notice("[src] begins climbing up \the [lattice]."), runemessage = "clank clang")
if(do_after(src, pull_up_time))
@@ -85,7 +92,7 @@
return 0
else if(istype(surface))
var/pull_up_time = max(5 SECONDS + (src.movement_delay() * 10), 1)
var/pull_up_time = max((5 SECONDS + (src.movement_delay() * 10) * swim_modifier), 1)
to_chat(src, span_notice("You start swimming upwards..."))
src.audible_message(span_notice("[src] begins to swim towards the surface."), runemessage = "splish splosh")
if(do_after(src, pull_up_time))
@@ -95,7 +102,7 @@
return 0
else if(catwalk?.hatch_open)
var/pull_up_time = max(5 SECONDS + (src.movement_delay() * 10), 1)
var/pull_up_time = max((5 SECONDS + (src.movement_delay() * 10) * climb_modifier), 1)
to_chat(src, span_notice("You grab the edge of \the [catwalk] and start pulling yourself upward..."))
var/old_dest = destination
destination = get_step(destination, dir) // mob's dir