From 11596be0d68c0e8ddd30f11737f5711f20f032fa Mon Sep 17 00:00:00 2001 From: Lostlarry Date: Tue, 10 Dec 2019 21:28:09 +0100 Subject: [PATCH 1/3] emag does the thing --- .../telecomms/machine_interactions.dm | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 1205bc17d701..a5559290dfc0 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -40,7 +40,9 @@ dat += "
[temp]
" dat += "
Power Status: [toggled ? "On" : "Off"]" if(on && toggled) - if(id != "" && id) + if(obj_flags & EMAGGED) + dat += "
-% [Gibberish("Identification String: NULL",100)]" + else if(id != "" && id) dat += "
Identification String: [id]" else dat += "
Identification String: NULL" @@ -53,6 +55,8 @@ dat += Options_Menu() dat += "
Linked Network Entities:
    " + if(obj_flags & EMAGGED) + dat += "
  1. -% [Gibberish("NULL NULL (NULL)",100)]
    2. " var/i = 0 for(var/obj/machinery/telecomms/T in links) @@ -64,6 +68,9 @@ dat += "
    Filtering Frequencies: " + if(obj_flags & EMAGGED) + dat += "
  2. -% [Gibberish("357353 GHz",100)]
    3. " + i = 0 if(length(freq_listening)) for(var/x in freq_listening) @@ -80,6 +87,8 @@ if(P) var/obj/machinery/telecomms/T = P.buffer + if(obj_flags & EMAGGED) + dat += "
    -% [Gibberish("MULTITOOL BUFFER: NULL (NULL)",100)]" if(istype(T)) dat += "

    MULTITOOL BUFFER: [T] ([T.id]) \[Link\] \[Flush\]" else @@ -124,6 +133,8 @@ var/dat = "" dat += "
    Broadcasting:     [broadcasting ? "YES" : "NO"]" dat += "
    Receiving: [receiving ? "YES" : "NO"]" + if(obj_flags & EMAGGED) + dat += "
    -% [Gibberish("BEEP BOOP HONK!",100)]" return dat /obj/machinery/telecomms/relay/Options_Topic(href, href_list) @@ -157,6 +168,22 @@ change_frequency = 0 temp = "-% Frequency changing deactivated %-" +/obj/machinery/telecomms/processor/Options_Menu() + if(obj_flags & EMAGGED) + var/dat = "
    Compressing signa;: [process_mode ? "YES )" : "NO"]" + return dat + . = ..() + +/obj/machinery/telecomms/processor/Options_Topic(href, href_list) + if(obj_flags & EMAGGED) + if(href_list["proc_mode"]) + if(canAccess(usr)) + if(process_mode == 1) + process_mode = 0 + temp = "-% Compressing Signal activated %-" + else + process_mode = 1 + temp = "-% Signal Compression halted %-" /obj/machinery/telecomms/Topic(href, href_list) if(..()) From 88d6d3a7b4baac63bf9f424d42de15df2a1e2ccc Mon Sep 17 00:00:00 2001 From: Lostlarry Date: Wed, 11 Dec 2019 18:49:19 +0100 Subject: [PATCH 2/3] more non sense --- .../telecomms/machine_interactions.dm | 26 +++++++++++-------- .../machinery/telecomms/machines/server.dm | 2 +- .../machinery/telecomms/telecomunications.dm | 7 ++++- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index a5559290dfc0..bdae7a4a9e8f 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -41,7 +41,7 @@ dat += "
    Power Status: [toggled ? "On" : "Off"]" if(on && toggled) if(obj_flags & EMAGGED) - dat += "
    -% [Gibberish("Identification String: NULL",100)]" + dat += "
    [Gibberish("Identification String: NULL",100)]" else if(id != "" && id) dat += "
    Identification String: [id]" else @@ -56,7 +56,7 @@ dat += "
    Linked Network Entities:
      " if(obj_flags & EMAGGED) - dat += "
    1. -% [Gibberish("NULL NULL (NULL)",100)]
      2. " + dat += "
    2. [Gibberish("NULL NULL (NULL)",100)]
      3. " var/i = 0 for(var/obj/machinery/telecomms/T in links) @@ -69,7 +69,7 @@ dat += "
      Filtering Frequencies: " if(obj_flags & EMAGGED) - dat += "
    3. -% [Gibberish("357353 GHz",100)]
      4. " + dat += "
    4. [Gibberish("357353 GHz",100)]
      5. " i = 0 if(length(freq_listening)) @@ -88,7 +88,7 @@ if(P) var/obj/machinery/telecomms/T = P.buffer if(obj_flags & EMAGGED) - dat += "
      -% [Gibberish("MULTITOOL BUFFER: NULL (NULL)",100)]" + dat += "
      [Gibberish("MULTITOOL BUFFER: NULL (NULL)",100)]" if(istype(T)) dat += "

      MULTITOOL BUFFER: [T] ([T.id]) \[Link\] \[Flush\]" else @@ -120,7 +120,10 @@ // Example of how to use below. /obj/machinery/telecomms/proc/Options_Menu() - return "" + var/dat = "" + if(obj_flags & EMAGGED) + dat += "
      -% [Gibberish("BEEP BOOP HONK!",100)]" + return dat // The topic for Additional Options. Use this for checking href links for your specific option. // Example of how to use below. @@ -133,8 +136,7 @@ var/dat = "" dat += "
      Broadcasting:       [broadcasting ? "YES" : "NO"]" dat += "
      Receiving: [receiving ? "YES" : "NO"]" - if(obj_flags & EMAGGED) - dat += "
      -% [Gibberish("BEEP BOOP HONK!",100)]" + dat += ..() return dat /obj/machinery/telecomms/relay/Options_Topic(href, href_list) @@ -150,6 +152,7 @@ /obj/machinery/telecomms/bus/Options_Menu() var/dat = "
      Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" + dat += ..() return dat /obj/machinery/telecomms/bus/Options_Topic(href, href_list) @@ -169,10 +172,11 @@ temp = "-% Frequency changing deactivated %-" /obj/machinery/telecomms/processor/Options_Menu() + var/dat if(obj_flags & EMAGGED) - var/dat = "
      Compressing signa;: [process_mode ? "YES )" : "NO"]" - return dat - . = ..() + dat = "
      Compressing signa;: [process_mode ? "YES" : "NO"]" + dat += ..() + return dat /obj/machinery/telecomms/processor/Options_Topic(href, href_list) if(obj_flags & EMAGGED) @@ -201,7 +205,7 @@ if("toggle") toggled = !toggled - temp = "-% [src] has been [toggled ? "activated" : "deactivated"]." + temp = " [src] has been [toggled ? "activated" : "deactivated"]." update_power() diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index 0653084bce23..4b6207a0dc7a 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -39,7 +39,7 @@ // If the signal is still compressed, make the log entry gibberish var/compression = signal.data["compression"] - if(compression > 0) + if(compression > 0 || (obj_flags & EMAGGED)) log.input_type = "Corrupt File" log.parameters["name"] = Gibberish(signal.data["name"], compression + 50) log.parameters["job"] = Gibberish(signal.data["job"], compression + 50) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 31de3ed34f3d..0b008d58368e 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -184,4 +184,9 @@ GLOBAL_LIST_EMPTY(telecomms_list) addtimer(CALLBACK(src, .proc/de_emp), rand(duration - 20, duration + 20)) /obj/machinery/telecomms/proc/de_emp() - stat &= ~EMPED \ No newline at end of file + stat &= ~EMPED + +/obj/machinery/telecomms/emag_act() + obj_flags |= EMAGGED + visible_message("Sparks fly out of the[src]!" + traffic += 50 \ No newline at end of file From 732098ffcc3e6b8b3713fea6ece3bdaba705a2dd Mon Sep 17 00:00:00 2001 From: Lostlarry Date: Fri, 13 Dec 2019 14:15:41 +0100 Subject: [PATCH 3/3] fixed the code --- code/game/machinery/telecomms/machine_interactions.dm | 10 ++-------- code/game/machinery/telecomms/telecomunications.dm | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index bdae7a4a9e8f..0674c6231026 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -120,10 +120,7 @@ // Example of how to use below. /obj/machinery/telecomms/proc/Options_Menu() - var/dat = "" - if(obj_flags & EMAGGED) - dat += "
      -% [Gibberish("BEEP BOOP HONK!",100)]" - return dat + return "" // The topic for Additional Options. Use this for checking href links for your specific option. // Example of how to use below. @@ -136,7 +133,6 @@ var/dat = "" dat += "
      Broadcasting: [broadcasting ? "YES" : "NO"]" dat += "
      Receiving: [receiving ? "YES" : "NO"]" - dat += ..() return dat /obj/machinery/telecomms/relay/Options_Topic(href, href_list) @@ -152,7 +148,6 @@ /obj/machinery/telecomms/bus/Options_Menu() var/dat = "
      Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" - dat += ..() return dat /obj/machinery/telecomms/bus/Options_Topic(href, href_list) @@ -172,10 +167,9 @@ temp = "-% Frequency changing deactivated %-" /obj/machinery/telecomms/processor/Options_Menu() - var/dat + var/dat = "" if(obj_flags & EMAGGED) dat = "
      Compressing signa;: [process_mode ? "YES" : "NO"]" - dat += ..() return dat /obj/machinery/telecomms/processor/Options_Topic(href, href_list) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 0b008d58368e..f30081e268ae 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -188,5 +188,5 @@ GLOBAL_LIST_EMPTY(telecomms_list) /obj/machinery/telecomms/emag_act() obj_flags |= EMAGGED - visible_message("Sparks fly out of the[src]!" + visible_message("Sparks fly out of the[src]!") traffic += 50 \ No newline at end of file