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

Update movement.dm

Browse Source
This commit is contained in:
Novacat
2020-08-28 12:58:04 -04:00
committed by GitHub
parent f2f5ba7a9e
commit 9ac3f02519
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,10 +81,6 @@
to_chat(src, "<span class='warning'>You gave up on pulling yourself up.</span>") to_chat(src, "<span class='warning'>You gave up on pulling yourself up.</span>")
return 0 return 0
else
to_chat(src, "<span class='warning'>Gravity stops you from moving upward.</span>")
return 0
<<<<<<< HEAD
else if(ismob(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying?? else if(ismob(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying??
var/mob/H = src var/mob/H = src
if(H.flying) if(H.flying)
@@ -104,11 +100,10 @@
else else
to_chat(src, "<span class='warning'>Gravity stops you from moving upward.</span>") to_chat(src, "<span class='warning'>Gravity stops you from moving upward.</span>")
return 0 //VOREStation Edit End. return 0 //VOREStation Edit End.
else else
to_chat(src, "<span class='warning'>Gravity stops you from moving upward.</span>") to_chat(src, "<span class='warning'>Gravity stops you from moving upward.</span>")
return 0 return 0
=======
>>>>>>> 8dc9ba1... Ladders respect Move Up/Down paradigm (#7559)
for(var/atom/A in destination) for(var/atom/A in destination)
if(!A.CanPass(src, start, 1.5, 0)) if(!A.CanPass(src, start, 1.5, 0))