Merge pull request #4128 from Citadel-Station-13/upstream-merge-33065

[MIRROR] Fixes rdconsole emagging
This commit is contained in:
deathride58
2017-11-27 05:19:49 +00:00
committed by GitHub
+5 -5
View File
@@ -148,11 +148,11 @@ 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)
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 ..()
/obj/machinery/computer/rdconsole/Topic(href, href_list)
if(..())