cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-02 21:11:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31286 from KorPhaeron/ismachinery

Browse Source 
ismachinery define
This commit is contained in:
Leo
2017-10-04 21:25:31 -03:00
committed by GitHub
parent aeea74ddbb 72389743db
commit 85d717350d
9 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/power/singularity/containment_field.dm
View File

@@ -58,7 +58,7 @@
if(isliving(mover))
shock(mover)
if(istype(mover, /obj/machinery) || isstructure(mover) || ismecha(mover))
if(ismachinery(mover) || isstructure(mover) || ismecha(mover))
bump_field(mover)
/obj/machinery/field/containment/proc/set_master(master1,master2)
@@ -90,13 +90,13 @@
if(isliving(mover))
shock(mover)
return
if(istype(mover, /obj/machinery) || isstructure(mover) || ismecha(mover))
if(ismachinery(mover) || isstructure(mover) || ismecha(mover))
bump_field(mover)
return
/obj/machinery/field/CanPass(atom/movable/mover, turf/target)
if(hasShocked || isliving(mover) || istype(mover, /obj/machinery) || isstructure(mover) || ismecha(mover))
if(hasShocked || isliving(mover) || ismachinery(mover) || isstructure(mover) || ismecha(mover))
return FALSE
return ..()