diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm
index 32b4a321f96..b5245272dc6 100644
--- a/code/modules/power/apc/apc_main.dm
+++ b/code/modules/power/apc/apc_main.dm
@@ -14,6 +14,10 @@
 ///Charge percentage at which the APC icon indicates discharging
 #define APC_CHANNEL_ALARM_TRESHOLD 75
 
+/obj/machinery/power/apc/proc/clap_handle()
+	lighting = APC_CHANNEL_IS_ON(lighting) ? 0 : 2
+	update()
+
 /obj/machinery/power/apc
 	name = "area power controller"
 	desc = "A control terminal for the area's electrical systems."
diff --git a/modular_zubbers/code/modules/emotes/emotes.dm b/modular_zubbers/code/modules/emotes/emotes.dm
index 9fa8da94b2a..53220b1aa6b 100644
--- a/modular_zubbers/code/modules/emotes/emotes.dm
+++ b/modular_zubbers/code/modules/emotes/emotes.dm
@@ -73,6 +73,28 @@
 	emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
 	sound = 'sound/mobs/humanoids/human/snap/fingersnap1.ogg'
 
+/datum/emote/living/snap/run_emote(mob/user, params, type_override, intentional)
+	. = ..()
+	for(var/obj/machinery/power/apc/this in oview(7, user))
+		this.clap_handle()
+
+/datum/emote/living/snap2/run_emote(mob/user, params, type_override, intentional)
+	. = ..()
+	for(var/obj/machinery/power/apc/this in oview(7, user))
+		this.clap_handle()
+/datum/emote/living/snap3/run_emote(mob/user, params, type_override, intentional)
+	. = ..()
+	for(var/obj/machinery/power/apc/this in oview(7, user))
+		this.clap_handle()
+/datum/emote/living/clap/run_emote(mob/user, params, type_override, intentional)
+	. = ..()
+	for(var/obj/machinery/power/apc/this in oview(7, user))
+		this.clap_handle()
+/datum/emote/living/clap1/run_emote(mob/user, params, type_override, intentional)
+	. = ..()
+	for(var/obj/machinery/power/apc/this in oview(7, user))
+		this.clap_handle()
+
 /datum/emote/living/meow_alt
 	key = "meow1"
 	key_third_person = "meowalt"