Fixes rdconsole emagging

2017-11-25 13:17:11 -08:00
parent 14ce7c8118
commit 437c527fd2
1 changed files with 8 additions and 0 deletions
@@ -148,11 +148,19 @@ won't update every console in existence) but it's more of a hassle to do. Also,


 /obj/machinery/computer/rdconsole/emag_act(mob/user)
+<<<<<<< HEAD
 	if(emagged)
 		return
 	playsound(src, "sparks", 75, 1)
 	emagged = TRUE
 	to_chat(user, "<span class='notice'>You disable the security protocols</span>")
+=======
+	if(!emagged)
+		to_chat(user, "<span class='notice'>You disable the security protocols</span>")
+		playsound(src, "sparks", 75, 1)
+		emagged = TRUE
+	return ..()
+>>>>>>> 1148c49... fixes emagging (#33065)

 /obj/machinery/computer/rdconsole/Topic(href, href_list)
 	if(..())