cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +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

16
code/datums/beam.dm
View File

@@ -138,12 +138,8 @@
return
/obj/effect/ebeam/deadly/Crossed(atom/A)
//VOREStation Edit begin: SHADEKIN
var/mob/SK = A
if(istype(SK))
if(SK.shadekin_phasing_check())
return
//VOREStation Edit end: SHADEKIN
if(A.is_incorporeal())
return
..()
A.ex_act(1)
@@ -163,12 +159,8 @@
on_contact(A)
/obj/effect/ebeam/reactive/Crossed(atom/A)
//VOREStation Edit begin: SHADEKIN
var/mob/SK = A
if(istype(SK))
if(SK.shadekin_phasing_check())
return
//VOREStation Edit end: SHADEKIN
if(A.is_incorporeal())
return
..()
on_contact(A)