mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-18 11:44:05 +01:00
[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:
committed by
GitHub
parent
494fc9bea9
commit
b116cc450d
@@ -53,6 +53,9 @@ a creative player the means to solve many problems. Circuits are held inside an
|
||||
. = ..()
|
||||
|
||||
/obj/item/integrated_circuit/emp_act(severity, recursive)
|
||||
. = ..()
|
||||
if (. & EMP_PROTECT_SELF)
|
||||
return
|
||||
for(var/datum/integrated_io/io in inputs + outputs + activators)
|
||||
io.scramble()
|
||||
|
||||
|
||||
@@ -268,10 +268,11 @@
|
||||
/obj/item/integrated_electronics/detailer, //CHOMP Edit,
|
||||
)
|
||||
|
||||
//CHOMPAdd, this whole proc. Emp'ing this one bag causes a recursion loop of over 700 emp_act's,
|
||||
//Emp'ing this one bag causes a recursion loop of over 700 emp_act's,
|
||||
//Which is enough to trigger byond's recursion level protection
|
||||
/obj/item/storage/bag/circuits/emp_act()
|
||||
return //No
|
||||
/obj/item/storage/bag/circuits/basic/Initialize(mapload)
|
||||
AddElement(/datum/element/empprotection, EMP_PROTECT_SELF)
|
||||
. = ..()
|
||||
|
||||
/obj/item/storage/bag/circuits/basic/Initialize(mapload)
|
||||
new /obj/item/storage/bag/circuits/mini/arithmetic(src)
|
||||
|
||||
@@ -85,11 +85,11 @@
|
||||
/obj/item/integrated_circuit/memory/constant/do_work()
|
||||
var/datum/integrated_io/O = outputs[1]
|
||||
O.push_data()
|
||||
|
||||
/*
|
||||
/obj/item/integrated_circuit/memory/constant/emp_act(severity, recursive)
|
||||
// Prevents default EMP behavior for single-slot constants memory.
|
||||
return
|
||||
|
||||
*/
|
||||
/obj/item/integrated_circuit/memory/constant/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
|
||||
Reference in New Issue
Block a user