mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 05:38:15 +01:00
[MIRROR] EMP cleanup (#11939)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
18997e2c84
commit
e98a9f484a
@@ -443,11 +443,6 @@
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/electronic_assembly/emp_act(severity)
|
||||
..()
|
||||
for(var/atom/movable/AM in contents)
|
||||
AM.emp_act(severity)
|
||||
|
||||
// Returns true if power was successfully drawn.
|
||||
/obj/item/electronic_assembly/proc/draw_power(amount)
|
||||
if(battery)
|
||||
|
||||
@@ -38,11 +38,6 @@
|
||||
var/obj/item/electronic_assembly/clothing/IC = null
|
||||
var/obj/item/integrated_circuit/built_in/action_button/action_circuit = null // This gets pulsed when someone clicks the button on the hud.
|
||||
|
||||
/obj/item/clothing/emp_act(severity)
|
||||
if(IC)
|
||||
IC.emp_act(severity)
|
||||
..()
|
||||
|
||||
/obj/item/clothing/examine(mob/user)
|
||||
. = ..()
|
||||
if(IC)
|
||||
|
||||
@@ -52,7 +52,7 @@ a creative player the means to solve many problems. Circuits are held inside an
|
||||
qdel(A)
|
||||
. = ..()
|
||||
|
||||
/obj/item/integrated_circuit/emp_act(severity)
|
||||
/obj/item/integrated_circuit/emp_act(severity, recursive)
|
||||
for(var/datum/integrated_io/io in inputs + outputs + activators)
|
||||
io.scramble()
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
var/datum/integrated_io/O = outputs[1]
|
||||
O.push_data()
|
||||
|
||||
/obj/item/integrated_circuit/memory/constant/emp_act(severity)
|
||||
/obj/item/integrated_circuit/memory/constant/emp_act(severity, recursive)
|
||||
// Prevents default EMP behavior for single-slot constants memory.
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user