[MIRROR] Cleaned up some emag_acts (#2018)

* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm

code/modules/power/apc.dm

@@ -612,6 +612,7 @@
 			to_chat(user, "<span class='warning'>Nothing happens!</span>")
 		else
 			flick("apc-spark", src)
+			playsound(src, "sparks", 75, 1)
 			emagged = TRUE
 			locked = FALSE
 			to_chat(user, "<span class='notice'>You emag the APC interface.</span>")

code/modules/power/port_gen.dm

@@ -216,9 +216,10 @@
 	return ..()
 
 /obj/machinery/power/port_gen/pacman/emag_act(mob/user)
-	if(!emagged)
-		emagged = TRUE
-		emp_act(EMP_HEAVY)
+	if(emagged)
+		return
+	emagged = TRUE
+	emp_act(EMP_HEAVY)
 
 /obj/machinery/power/port_gen/pacman/attack_hand(mob/user)
 	..()

code/modules/power/singularity/emitter.dm

@@ -342,11 +342,12 @@
 	return ..()
 
 /obj/machinery/power/emitter/emag_act(mob/user)
-	if(!emagged)
-		locked = FALSE
-		emagged = TRUE
-		if(user)
-			user.visible_message("[user.name] emags the [src.name].","<span class='notice'>You short out the lock.</span>")
+	if(emagged)
+		return
+	locked = FALSE
+	emagged = TRUE
+	if(user)
+		user.visible_message("[user.name] emags the [src].","<span class='notice'>You short out the lock.</span>")
 
 
 /obj/machinery/power/emitter/prototype