From a4142fa0987d1816351e67efbca85477fb63dbe7 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 17 Oct 2012 00:09:49 +0400 Subject: [PATCH] Throwing metal (with non-zero m_amt) items will make electrified doors and grilles spark. --- code/game/machinery/doors/airlock.dm | 10 +++++++++- code/game/objects/structures/grille.dm | 10 ++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 716d05ae1b8..86e4b25cf72 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -828,7 +828,15 @@ About the new airlock wires panel: src.aiHacking = 0 src.attack_ai(user) - +/obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) + if (src.isElectrified()) + if (istype(mover, /obj/item)) + var/obj/item/i = mover + if (i.m_amt) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(5, 1, src) + s.start() + return ..() /obj/machinery/door/airlock/attack_paw(mob/user as mob) return src.attack_hand(user) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 7b4687bf478..32f1bf697d6 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -101,6 +101,16 @@ if (istype(mover, /obj/item/projectile)) return prob(30) else + var/turf/T = get_turf(src) + var/obj/structure/cable/C = T.get_cable_node() + if(C) + if (C.powernet.avail) + if (istype(mover, /obj/item)) + var/obj/item/i = mover + if (i.m_amt) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(5, 1, src) + s.start() return !src.density