[MIRROR] Cleaned up some emag_acts (#2018)

* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
This commit is contained in:
CitadelStationBot
2017-07-15 15:17:56 -05:00
committed by kevinz000
parent 099b908d64
commit d21766956e
40 changed files with 200 additions and 169 deletions
+5 -4
View File
@@ -150,10 +150,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)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = TRUE
to_chat(user, "<span class='notice'>You disable the security protocols</span>")
if(emagged)
return
playsound(src, "sparks", 75, 1)
emagged = TRUE
to_chat(user, "<span class='notice'>You disable the security protocols</span>")
/obj/machinery/computer/rdconsole/Topic(href, href_list)
if(..())
+5 -4
View File
@@ -316,10 +316,11 @@
src.updateUsrDialog()
/obj/machinery/computer/rdservercontrol/emag_act(mob/user)
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = TRUE
to_chat(user, "<span class='notice'>You you disable the security protocols.</span>")
if(emagged)
return
playsound(src, "sparks", 75, 1)
emagged = TRUE
to_chat(user, "<span class='notice'>You you disable the security protocols.</span>")
/obj/machinery/r_n_d/server/robotics
name = "Robotics R&D Server"