Replace a bunch of VOREStation edits that can be sent to Polaris

This commit is contained in:
Aronai Sieyes
2020-02-29 19:45:58 -05:00
parent 8175d5d17a
commit f475ecbdc6
28 changed files with 73 additions and 187 deletions
+2 -6
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)
+2 -6
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)
+3 -7
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