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 #6709 from VOREStation/aro-mistake

Browse Source 
Fix way too many vorestation edits
This commit is contained in:
Novacat
2020-03-05 19:03:58 -05:00
committed by GitHub
parent efdb9c9340 107cc139ad
commit 6e23c5f45a
31 changed files with 87 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/projectile.dm
View File

@@ -219,12 +219,8 @@
Range()
/obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it.
//VOREStation Edit begin: SHADEKIN
var/mob/SK = AM
if(istype(SK))
if(SK.shadekin_phasing_check())
return
//VOREStation Edit end: SHADEKIN
if(AM.is_incorporeal())
return
..()
if(isliving(AM) && !(pass_flags & PASSMOB))
var/mob/living/L = AM