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

Merge pull request #10340 from Verkister/patch-51

Browse Source 
Fixes ghosts breaking dropnoms
This commit is contained in:
Novacat
2021-05-16 14:36:17 -04:00
committed by Chompstation Bot
parent b953b2db37
commit 85a20c82c9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/multiz/movement_vr.dm
View File

@@ -1,6 +1,6 @@
/mob/living/handle_fall(var/turf/landing)
var/mob/drop_mob = locate(/mob, landing)
var/mob/drop_mob = locate(/mob/living, landing)
if(locate(/obj/structure/stairs) in landing)
for(var/atom/A in landing)
@@ -17,7 +17,7 @@
if(!O.CanFallThru(src, landing))
return 1
if(drop_mob && !(drop_mob == src) && ismob(drop_mob) && isliving(drop_mob)) //Shitload of checks. This is because the game finds various ways to screw me over.
if(drop_mob && !(drop_mob == src)) //Shitload of checks. This is because the game finds various ways to screw me over.
var/mob/living/drop_living = drop_mob
if(drop_living.dropped_onto(src))
return
@@ -105,4 +105,4 @@
if(direction == UP) //on a turf below, trying to enter
return 0
if(direction == DOWN) //on a turf above, trying to enter
return 1
return 1