Merge pull request #1041 from Citadel-Station-13/upstream-merge-27359

[MIRROR] Plastic explosives can no longer be detonated by EMPs
2017-05-18 23:44:53 -04:00
parent 514d29043e 3a90a50af9
commit 6abf2a53be
1 changed files with 4 additions and 0 deletions
@@ -18,6 +18,10 @@
 	plastic_overlay = mutable_appearance(icon, "[item_state]2")
 	..()

+/obj/item/weapon/grenade/plastic/Initialize(mapload)
+	. = ..()
+	SET_SECONDARY_FLAG(src, NO_EMP_WIRES)
+
 /obj/item/weapon/grenade/plastic/Destroy()
 	qdel(nadeassembly)
 	nadeassembly = null