cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 01:00:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Ports RS 658, 661 and some minor things (#9557)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-11-29 21:31:19 +01:00
committed by GitHub
co-authored by Heroman3003 Kashargul
parent 06f69815dd
commit 35bf63ec81
8 changed files with 169 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/multiz/movement.dm
+7 -2
View File
@@ -79,7 +79,6 @@
if(direction == UP)
var/obj/structure/lattice/lattice = locate() in destination.contents
var/obj/structure/catwalk/catwalk = locate() in destination.contents
var/turf/simulated/floor/water/deep/ocean/diving/surface = destination
if(lattice)
var/pull_up_time = max((5 SECONDS + (src.movement_delay() * 10) * climb_modifier), 1)
@@ -91,7 +90,7 @@
to_chat(src, span_warning("You gave up on pulling yourself up."))
return 0
else if(istype(surface))
else if(istype(destination, /turf/simulated/floor/water/deep/ocean/diving))
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")
@@ -116,6 +115,12 @@
to_chat(src, span_warning("You gave up on pulling yourself up."))
return 0
//RS Port #661 Start, Prevents noclipping
else if(!istype(destination, /turf/simulated/open))
to_chat(src, span_warning("Something solid above stops you from passing."))
return 0
//RS Port #661 End
else if(isliving(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying??
var/mob/living/H = src
if(H.flying)