cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes containment field CanPass

Browse Source
This commit is contained in:
AnturK
2017-09-06 14:56:56 +02:00
parent 6e67ff7e4a
commit 2814432f90
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/containment_field.dm
+10 -7
View File
@@ -57,8 +57,7 @@
/obj/machinery/field/containment/Crossed(mob/mover) /obj/machinery/field/containment/Crossed(mob/mover)
if(isliving(mover)) if(isliving(mover))
shock(mover) shock(mover)
/obj/machinery/field/containment/Crossed(obj/mover)
if(istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha)) if(istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha))
bump_field(mover) bump_field(mover)
@@ -79,21 +78,25 @@
qdel(src) qdel(src)
// Abstract Field Class // Abstract Field Class
// Used for overriding certain procs // Used for overriding certain procs
/obj/machinery/field /obj/machinery/field
var/hasShocked = FALSE //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second. var/hasShocked = FALSE //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second.
/obj/machinery/field/CanPass(atom/movable/mover, turf/target) /obj/machinery/field/CollidedWith(atom/movable/mover)
if(hasShocked) if(hasShocked)
return FALSE return
if(isliving(mover)) // Don't let mobs through if(isliving(mover))
shock(mover) shock(mover)
return FALSE return
if(istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha)) if(istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha))
bump_field(mover) bump_field(mover)
return
/obj/machinery/field/CanPass(atom/movable/mover, turf/target)
if(hasShocked || isliving(mover) || istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha))
return FALSE return FALSE
return ..() return ..()