[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
+2 -4
View File
@@ -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()
@@ -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()