Throwing items through shocked airlocks will no longer cause the airlock to spark

This commit is contained in:
Citinited
2017-07-07 14:19:02 +01:00
parent cd5ba823f2
commit 353ceb0693
+6 -8
View File
@@ -646,14 +646,12 @@ About the new airlock wires panel:
if(user)
src.attack_ai(user)
/obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target, height=0)
if(src.isElectrified())
if(istype(mover, /obj/item))
var/obj/item/i = mover
if(i.materials[MAT_METAL])
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
/obj/machinery/door/airlock/CanPass(obj/item/mover)
if(isElectrified() && density)
if(mover.flags & CONDUCT)
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
return ..()
/obj/machinery/door/airlock/attack_hand(mob/user as mob)