cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactors shadekin

Browse Source
This commit is contained in:
Heroman
2019-04-28 15:10:06 +10:00
parent 4a5512c864
commit 703c27da7e
43 changed files with 686 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/assembly/holder.dm
View File

@@ -104,6 +104,12 @@
/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(a_left)
a_left.Crossed(AM)
if(a_right)

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

@@ -25,7 +25,7 @@
/obj/item/device/assembly/infra/toggle_secure()
secured = !secured
if(secured)
START_PROCESSING(SSobj, src)
START_PROCESSING(SSobj, src)
else
on = 0
if(first) qdel(first)
@@ -242,6 +242,12 @@
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(istype(AM, /obj/effect/beam))
return
spawn(0)

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

@@ -83,6 +83,12 @@
/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
if(armed)
if(ishuman(AM))
var/mob/living/carbon/H = AM