[MIRROR] EMP & Wires refactor (#12658)

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-04-11 16:14:18 -04:00
committed by GitHub
co-authored by Guti Cameron Lennox
parent 494fc9bea9
commit b116cc450d
148 changed files with 665 additions and 384 deletions
@@ -316,6 +316,9 @@
matter = list(MAT_STEEL = 360, MAT_GLASS = 720)
/obj/item/ammo_casing/a12g/stunshell/emp_act(severity, recursive)
. = ..()
if (. & EMP_PROTECT_SELF)
return
if(prob(100/severity)) BB = null
update_icon()
+3 -1
View File
@@ -111,7 +111,9 @@
update_icon()
/obj/item/gun/energy/emp_act(severity, recursive)
..()
. = ..()
if (. & EMP_PROTECT_SELF)
return
update_icon()
/obj/item/gun/energy/consume_next_projectile()
@@ -211,9 +211,6 @@
deltimer(recharge_timerid)
recharge_timerid = addtimer(CALLBACK(src, PROC_REF(reload)), recharge_time * carried, TIMER_STOPPABLE)
/obj/item/gun/energy/kinetic_accelerator/emp_act(severity, recursive)
return
/obj/item/gun/energy/kinetic_accelerator/proc/reload()
power_supply.give(power_supply.maxcharge)
// process_chamber()
@@ -107,6 +107,9 @@
..()
/obj/item/gun/energy/locked/frontier/emp_act(severity, recursive)
. = ..()
if (. & EMP_PROTECT_SELF)
return
return ..(severity+2, recursive)
/obj/item/gun/energy/locked/frontier/ex_act() //|rugged|
@@ -13,9 +13,6 @@
slot_flags = SLOT_BACK
projectile_type = /obj/item/projectile/ion
/obj/item/gun/energy/ionrifle/emp_act(severity, recursive)
return
/obj/item/gun/energy/ionrifle/empty
cell_type = null