cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +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/assembly/holder.dm
View File

@@ -104,12 +104,8 @@
/obj/item/device/assembly_holder/Crossed(atom/movable/AM as mob|obj)
//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(a_left)
a_left.Crossed(AM)
if(a_right)

8
code/modules/assembly/infrared.dm
View File

@@ -242,12 +242,8 @@
return
/obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
//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(istype(AM, /obj/effect/beam))
return
spawn(0)

10
code/modules/assembly/mousetrap.dm
View File

@@ -82,13 +82,9 @@
..()
/obj/item/device/assembly/mousetrap/Crossed(AM as mob|obj)
//VOREStation Edit begin: SHADEKIN
var/mob/SK = AM
if(istype(SK))
if(SK.shadekin_phasing_check())
return
//VOREStation Edit end: SHADEKIN
/obj/item/device/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
return
if(armed)
if(ishuman(AM))
var/mob/living/carbon/H = AM