[MIRROR] Fix EMP event unregistration and inconsistent /emp_act() ove…

…rride
SierraBay · Nov 30, 2023 · 94cdced · 94cdced
1 parent c205847
commit 94cdced
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/datums/extensions/chameleon.dm b/code/datums/extensions/chameleon.dm
@@ -27,7 +27,7 @@
 /datum/extension/chameleon/Destroy()
 	if (emp_amount)
 		STOP_PROCESSING(SSobj, src)
-	GLOB.empd_event.unregister(item_holder)
+	GLOB.empd_event.unregister(item_holder, src)
 	item_holder.verbs -= chameleon_verbs
 	item_holder = null
 	return ..()

diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
@@ -44,7 +44,7 @@
 // This is a mainly physical thing, not affected by electricity
 /obj/item/integrated_circuit/input/toggle_button/emp_act(severity)
 	SHOULD_CALL_PARENT(FALSE)
-	GLOB.empd_event.raise_event(src, severity)
+	return
 
 /obj/item/integrated_circuit/input/toggle_button/get_topic_data(mob/user)
 	return list("Toggle [get_pin_data(IC_OUTPUT, 1) ? "Off" : "On"]" = "toggle=1")