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
+6 -14
View File
@@ -8,13 +8,9 @@
/*
* Banana Peals
*/
/obj/item/weapon/bananapeel/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/weapon/bananapeel/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
return
if (istype(AM, /mob/living))
var/mob/living/M = AM
M.slip("the [src.name]",4)
@@ -29,13 +25,9 @@
/obj/item/weapon/soap/proc/wet()
reagents.add_reagent("cleaner", 5)
/obj/item/weapon/soap/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/weapon/soap/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
return
if (istype(AM, /mob/living))
var/mob/living/M = AM
M.slip("the [src.name]",3)
@@ -106,14 +106,10 @@
qdel(src)
return
/obj/item/weapon/material/shard/Crossed(AM as mob|obj)
/obj/item/weapon/material/shard/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(isliving(AM))
var/mob/M = AM
+3 -7
View File
@@ -107,13 +107,9 @@
deployed = 0
can_buckle = initial(can_buckle)
/obj/item/weapon/beartrap/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/weapon/beartrap/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
return
if(deployed && isliving(AM))
var/mob/living/L = AM
if(L.m_intent == "run")