[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
@@ -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
@@ -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())
@@ -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")
@@ -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>")