[MIRROR] Cleaned up some emag_acts (#2018)

* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm

code/game/objects/items/devices/geiger_counter.dm

@@ -144,12 +144,13 @@
 	update_icon()
 
 /obj/item/device/geiger_counter/emag_act(mob/user)
-	if(!emagged)
-		if(scanning)
-			to_chat(user, "<span class='warning'>Turn off [src] before you perform this action!</span>")
-			return 0
-		to_chat(user, "<span class='warning'>You override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.</span>")
-		emagged = TRUE
+	if(emagged)
+		return
+	if(scanning)
+		to_chat(user, "<span class='warning'>Turn off [src] before you perform this action!</span>")
+		return 0
+	to_chat(user, "<span class='warning'>You override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.</span>")
+	emagged = TRUE
 
 #undef RAD_LEVEL_NORMAL
 #undef RAD_LEVEL_MODERATE

code/game/objects/items/devices/lightreplacer.dm

@@ -148,8 +148,9 @@
 		to_chat(user, "<span class='notice'>You fill \the [src] with lights from \the [S]. " + status_string() + "</span>")
 
 /obj/item/device/lightreplacer/emag_act()
-	if(!emagged)
-		Emag()
+	if(emagged)
+		return
+	Emag()
 
 /obj/item/device/lightreplacer/attack_self(mob/user)
 	to_chat(user, status_string())

code/game/objects/items/devices/megaphone.dm

@@ -18,6 +18,8 @@
 		return voicespan
 
 /obj/item/device/megaphone/emag_act(mob/user)
+	if(emagged)
+		return
 	to_chat(user, "<span class='warning'>You overload \the [src]'s voice synthesizer.</span>")
 	emagged = TRUE
 	voicespan = list(SPAN_REALLYBIG, "userdanger")

code/game/objects/items/weapons/storage/lockbox.dm

@@ -56,6 +56,7 @@
 		if(user)
 			visible_message("<span class='warning'>\The [src] has been broken by [user] with an electromagnetic card!</span>")
 			return
+
 /obj/item/weapon/storage/lockbox/show_to(mob/user)
 	if(locked)
 		to_chat(user, "<span class='warning'>It's locked!</span>")

code/game/objects/structures/barsigns.dm

@@ -118,13 +118,11 @@
 	if(broken || emagged)
 		to_chat(user, "<span class='warning'>Nothing interesting happens!</span>")
 		return
+	emagged = TRUE
+	req_access = list(GLOB.access_syndicate)
 	to_chat(user, "<span class='notice'>You emag the barsign. Takeover in progress...</span>")
 	sleep(100) //10 seconds
 	set_sign(new /datum/barsign/hiddensigns/syndibarsign)
-	emagged = TRUE
-	req_access = list(GLOB.access_syndicate)
-
-
 
 
 /obj/structure/sign/barsign/proc/pick_sign()

code/game/objects/structures/crates_lockers/closets.dm

@@ -415,7 +415,7 @@
 		user.visible_message("<span class='warning'>Sparks fly from [src]!</span>",
 						"<span class='warning'>You scramble [src]'s lock, breaking it open!</span>",
 						"<span class='italics'>You hear a faint electrical spark.</span>")
-		playsound(src.loc, 'sound/effects/sparks4.ogg', 50, 1)
+		playsound(src, "sparks", 50, 1)
 		broken = 1
 		locked = FALSE
 		update_icon()