shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Cleaned up some emag_acts (#2018)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/airalarm.dm
+2 -2
View File
@@ -714,8 +714,8 @@
if(emagged)
return
emagged = TRUE
visible_message("<span class='warning'>Sparks fly out of the [src]!</span>", "<span class='notice'>You emag the [src], disabling its safeties.</span>")
playsound(src.loc, 'sound/effects/sparks4.ogg', 50, 1)
visible_message("<span class='warning'>Sparks fly out of [src]!</span>", "<span class='notice'>You emag [src], disabling its safeties.</span>")
playsound(src, "sparks", 50, 1)
/obj/machinery/airalarm/obj_break(damage_flag)
..()
code/modules/cargo/console.dm
+11 -10
View File
@@ -24,18 +24,19 @@
contraband = board.contraband
emagged = board.emagged
/obj/machinery/computer/cargo/emag_act(mob/living/user)
if(!emagged)
user.visible_message("<span class='warning'>[user] swipes a suspicious card through [src]!",
"<span class='notice'>You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.</span>")
/obj/machinery/computer/cargo/emag_act(mob/user)
if(emagged)
return
user.visible_message("<span class='warning'>[user] swipes a suspicious card through [src]!",
"<span class='notice'>You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.</span>")
emagged = TRUE
contraband = TRUE
emagged = TRUE
contraband = TRUE
// This also permamently sets this on the circuit board
var/obj/item/weapon/circuitboard/computer/cargo/board = circuit
board.contraband = TRUE
board.emagged = TRUE
// This also permamently sets this on the circuit board
var/obj/item/weapon/circuitboard/computer/cargo/board = circuit
board.contraband = TRUE
board.emagged = TRUE
/obj/machinery/computer/cargo/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
code/modules/clothing/glasses/hud.dm
+9 -7
View File
@@ -18,15 +18,17 @@
H.remove_hud_from(user)
/obj/item/clothing/glasses/hud/emp_act(severity)
if(emagged == 0)
emagged = TRUE
desc = "[desc] The display is flickering slightly."
if(emagged)
return
emagged = TRUE
desc = "[desc] The display is flickering slightly."
/obj/item/clothing/glasses/hud/emag_act(mob/user)
if(emagged == 0)
emagged = TRUE
to_chat(user, "<span class='warning'>PZZTTPFFFT</span>")
desc = "[desc] The display is flickering slightly."
if(emagged)
return
emagged = TRUE
to_chat(user, "<span class='warning'>PZZTTPFFFT</span>")
desc = "[desc] The display is flickering slightly."
/obj/item/clothing/glasses/hud/health
name = "health scanner HUD"
code/modules/holodeck/computer.dm
+1 -1
View File
@@ -154,7 +154,7 @@
if(!LAZYLEN(emag_programs))
to_chat(user, "[src] does not seem to have a card swipe port. It must be an inferior model.")
return
playsound(src, 'sound/effects/sparks4.ogg', 75, 1)
playsound(src, "sparks", 75, 1)
emagged = TRUE
to_chat(user, "<span class='warning'>You vastly increase projector power and override the safety and security protocols.</span>")
to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.")
code/modules/mob/living/simple_animal/bot/bot.dm
+1 -1
View File
@@ -169,7 +169,7 @@
/mob/living/simple_animal/bot/emag_act(mob/user)
if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again.
locked = FALSE
emagged = TRUE
emagged = 1
to_chat(user, "<span class='notice'>You bypass [src]'s controls.</span>")
return
if(!locked && open) //Bot panel is unlocked by ID or emag, and the panel is screwed open. Ready for emagging.
code/modules/mob/living/simple_animal/bot/medbot.dm
+1
View File
@@ -245,6 +245,7 @@
to_chat(user, "<span class='notice'>You short out [src]'s reagent synthesis circuits.</span>")
audible_message("<span class='danger'>[src] buzzes oddly!</span>")
flick("medibot_spark", src)
playsound(src, "sparks", 75, 1)
if(user)
oldpatient = user
code/modules/mob/living/simple_animal/bot/mulebot.dm
+1 -1
View File
@@ -119,7 +119,7 @@
locked = !locked
to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] the [src]'s controls!</span>")
flick("mulebot-emagged", src)
playsound(loc, 'sound/effects/sparks1.ogg', 100, 0)
playsound(src, "sparks", 100, 0)
/mob/living/simple_animal/bot/mulebot/update_icon()
if(open)
code/modules/ninja/suit/ninjaDrainAct.dm
+1
View File
@@ -52,6 +52,7 @@ They *could* go in their appropriate files, but this is supposed to be modular
if(!emagged)
flick("apc-spark", G)
playsound(loc, "sparks", 50, 1)
emagged = TRUE
locked = FALSE
update_icon()
code/modules/power/apc.dm
+1
View File
@@ -612,6 +612,7 @@
to_chat(user, "<span class='warning'>Nothing happens!</span>")
else
flick("apc-spark", src)
playsound(src, "sparks", 75, 1)
emagged = TRUE
locked = FALSE
to_chat(user, "<span class='notice'>You emag the APC interface.</span>")
code/modules/power/port_gen.dm
+4 -3
View File
@@ -216,9 +216,10 @@
return ..()
/obj/machinery/power/port_gen/pacman/emag_act(mob/user)
if(!emagged)
emagged = TRUE
emp_act(EMP_HEAVY)
if(emagged)
return
emagged = TRUE
emp_act(EMP_HEAVY)
/obj/machinery/power/port_gen/pacman/attack_hand(mob/user)
..()
code/modules/power/singularity/emitter.dm
+6 -5
View File
@@ -342,11 +342,12 @@
return ..()
/obj/machinery/power/emitter/emag_act(mob/user)
if(!emagged)
locked = FALSE
emagged = TRUE
if(user)
user.visible_message("[user.name] emags the [src.name].","<span class='notice'>You short out the lock.</span>")
if(emagged)
return
locked = FALSE
emagged = TRUE
if(user)
user.visible_message("[user.name] emags the [src].","<span class='notice'>You short out the lock.</span>")
/obj/machinery/power/emitter/prototype
code/modules/projectiles/pins.dm
+4 -3
View File
@@ -39,9 +39,10 @@
to_chat(user, "<span class ='notice'>This firearm already has a firing pin installed.</span>")
/obj/item/device/firing_pin/emag_act(mob/user)
if(!emagged)
emagged = TRUE
to_chat(user, "<span class='notice'>You override the authentication mechanism.</span>")
if(emagged)
return
emagged = TRUE
to_chat(user, "<span class='notice'>You override the authentication mechanism.</span>")
/obj/item/device/firing_pin/proc/gun_insert(mob/living/user, obj/item/weapon/gun/G)
gun = G
code/modules/research/rdconsole.dm
+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(..())
code/modules/research/server.dm
+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"
code/modules/shuttle/computer.dm
+5 -4
View File
@@ -72,8 +72,9 @@
to_chat(usr, "<span class='notice'>Unable to comply.</span>")
/obj/machinery/computer/shuttle/emag_act(mob/user)
if(!emagged)
src.req_access = list()
emagged = TRUE
to_chat(user, "<span class='notice'>You fried the consoles ID checking system.</span>")
if(emagged)
return
req_access = null
emagged = TRUE
to_chat(user, "<span class='notice'>You fried the consoles ID checking system.</span>")
code/modules/shuttle/emergency.dm
+4 -3
View File
@@ -448,9 +448,10 @@
return
/obj/machinery/computer/shuttle/pod/emag_act(mob/user)
if(!emagged)
emagged = TRUE
to_chat(user, "<span class='warning'>You fry the pod's alert level checking system.</span>")
if(emagged)
return
emagged = TRUE
to_chat(user, "<span class='warning'>You fry the pod's alert level checking system.</span>")
/obj/docking_port/stationary/random
name = "escape pod"
code/modules/station_goals/shield.dm
+5 -4
View File
@@ -176,7 +176,8 @@
change_meteor_chance(0.5)
/obj/machinery/satellite/meteor_shield/emag_act()
if(!emagged)
emagged = TRUE
if(active)
change_meteor_chance(2)
if(emagged)
return
emagged = TRUE
if(active)
change_meteor_chance(2)