cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 14:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/modules/multiz/movement.dm
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-6_surface.dmm
This commit is contained in:
skull132
2018-01-21 23:51:44 +02:00
parent 2fddb0a25c 5dd6e0e2a0
commit 1e973b2d6a
36 changed files with 463 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,11 +200,10 @@
return FALSE
// Lattices, ladders, and stairs stop things from falling.
if(locate(/obj/structure/lattice, dest) || locate(/obj/structure/stairs, dest) || locate(/obj/structure/ladder, dest))
if(locate(/obj/structure/lattice, dest) || locate(/obj/structure/stairs, dest))
return FALSE
//Ladders too
if(below && locate(/obj/structure/ladder) in below)
if(ismob(src) && locate(/obj/structure/ladder, dest)) //hmmm how is this locker just floating here?
return FALSE
// The var/climbers API is implemented here.