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

Conflicts resolved, excluding the .dme

Browse Source
This commit is contained in:
Spades
2019-01-05 16:38:33 -05:00
parent 58e4a98a94
commit 5cb647993c
4 changed files with 5 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,12 +149,9 @@
/turf/simulated/open/is_space()
var/turf/below = GetBelow(src)
return !below || below.is_space()
<<<<<<< HEAD
=======
/turf/simulated/open/is_safe_to_enter(mob/living/L)
if(L.can_fall())
if(!locate(/obj/structure/stairs) in GetBelow(src))
return FALSE
return ..()
>>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
return ..()