From 3f3764e3cf07b48aec9ac5bda9122af8c322090a Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:21:28 -0600 Subject: [PATCH 01/57] Update declarations.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/__DEFINES/traits/declarations.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index 64e5031cd667a..d892b185ed706 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -71,6 +71,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai // Antagonizes the above. #define TRAIT_DISCOORDINATED_TOOL_USER "discoordinated_tool_user" #define TRAIT_PACIFISM "pacifism" +/// The trait that determines if someone has the system shock quirk. +#define TRAIT_SYSTEM_SHOCK "trait_system_shock" // Trait added to the user of a hippocratic oath status effect #define TRAIT_HIPPOCRATIC_OATH "hippocratic_oath" #define TRAIT_IGNORESLOWDOWN "ignoreslow" From a9a9f1dd529753a97d03f1d471c19f6e7ba23953 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:22:45 -0600 Subject: [PATCH 02/57] Update _traits.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/_globalvars/traits/_traits.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index 6c0d4441e6463..a260cd4717a0a 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -352,6 +352,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_MULTIZ_SUIT_SENSORS" = TRAIT_MULTIZ_SUIT_SENSORS, "TRAIT_MUSICIAN" = TRAIT_MUSICIAN, "TRAIT_MUTANT_COLORS" = TRAIT_MUTANT_COLORS, + "TRAIT_SYSTEM_SHOCK" = TRAIT_SYSTEM_SHOCK, "TRAIT_MUTE" = TRAIT_MUTE, "TRAIT_NAIVE" = TRAIT_NAIVE, "TRAIT_NEARSIGHTED_CORRECTED" = TRAIT_NEARSIGHTED_CORRECTED, From d701ca681012b3a921337714b8f8ddd31c18e1c7 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:24:32 -0600 Subject: [PATCH 03/57] Update admin_tooling.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/_globalvars/traits/admin_tooling.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm index 0a7eef38b742f..0eb0e171b48b6 100644 --- a/code/_globalvars/traits/admin_tooling.dm +++ b/code/_globalvars/traits/admin_tooling.dm @@ -111,6 +111,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_FISH_EATER" = TRAIT_FISH_EATER, "TRAIT_FIST_MINING" = TRAIT_FIST_MINING, "TRAIT_FIXED_MUTANT_COLORS" = TRAIT_FIXED_MUTANT_COLORS, + "TRAIT_SYSTEM_SHOCK" = TRAIT_SYSTEM_SHOCK, "TRAIT_FLESH_DESIRE" = TRAIT_FLESH_DESIRE, "TRAIT_FLOORED" = TRAIT_FLOORED, "TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION" = TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION, From 5e92afef008c850948dbebec6dc5ffee58de85b2 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:26:39 -0600 Subject: [PATCH 04/57] Update generic.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/game/objects/items/robot/items/generic.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/robot/items/generic.dm b/code/game/objects/items/robot/items/generic.dm index 385baa0381ae9..f9af555ea35de 100644 --- a/code/game/objects/items/robot/items/generic.dm +++ b/code/game/objects/items/robot/items/generic.dm @@ -54,6 +54,7 @@ span_userdanger("[user] prods you with [src]!"), ) + SEND_SIGNAL(attacked_mob, COMSIG_LIVING_MINOR_SHOCK) playsound(loc, 'sound/items/weapons/egloves.ogg', 50, TRUE, -1) cooldown_check = world.time + cooldown log_combat(user, attacked_mob, "stunned", src, "(Combat mode: [user.combat_mode ? "On" : "Off"])") From a1c140dc6fd8322053c242b5d54720e5e2ef5b84 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:29:26 -0600 Subject: [PATCH 05/57] Update MMI.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/modules/mob/living/brain/MMI.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index 592d187ebbf0b..dbfb2a791573d 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -290,6 +290,7 @@ if(3) brainmob.emp_damage = min(brainmob.emp_damage + rand(0,10), 30) brainmob.emote("alarm") + SEND_SIGNAL(brainmob, COMSIG_LIVING_MINOR_SHOCK) // NOVA EDIT ADDITION /obj/item/mmi/atom_deconstruct(disassembled = TRUE) if(brain) From 49e05860307f25ec675511cdce8cc308fc737f32 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:30:43 -0600 Subject: [PATCH 06/57] Update generic.dm forgot this lol .... Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/game/objects/items/robot/items/generic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/robot/items/generic.dm b/code/game/objects/items/robot/items/generic.dm index f9af555ea35de..089f79af72605 100644 --- a/code/game/objects/items/robot/items/generic.dm +++ b/code/game/objects/items/robot/items/generic.dm @@ -54,7 +54,7 @@ span_userdanger("[user] prods you with [src]!"), ) - SEND_SIGNAL(attacked_mob, COMSIG_LIVING_MINOR_SHOCK) + SEND_SIGNAL(attacked_mob, COMSIG_LIVING_MINOR_SHOCK) // NOVA EDIT ADDITION playsound(loc, 'sound/items/weapons/egloves.ogg', 50, TRUE, -1) cooldown_check = world.time + cooldown log_combat(user, attacked_mob, "stunned", src, "(Combat mode: [user.combat_mode ? "On" : "Off"])") From 50353812cf2d014645144971207379096d4bb414 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:32:47 -0600 Subject: [PATCH 07/57] Add files via upload Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- .../negative_quirks/system_shock_quirk.dm | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 code/datums/quirks/negative_quirks/system_shock_quirk.dm diff --git a/code/datums/quirks/negative_quirks/system_shock_quirk.dm b/code/datums/quirks/negative_quirks/system_shock_quirk.dm new file mode 100644 index 0000000000000..510affb437924 --- /dev/null +++ b/code/datums/quirks/negative_quirks/system_shock_quirk.dm @@ -0,0 +1,30 @@ +/datum/quirk/system_shock + name = "System Shock" + desc = "You and electricity have a volatile relationship. One spark's liable to forcefully reboot your systems. Note: This quirk only works on synths." + gain_text = span_danger("You start feeling nervous around plug sockets.") + lose_text = span_notice("You feel normal about sparks.") + medical_record_text = "Patient's processors are unusually uninsulated." + value = -8 + mob_trait = TRAIT_SYSTEM_SHOCK + icon = FA_ICON_PLUG_CIRCLE_XMARK + quirk_flags = QUIRK_HUMAN_ONLY + +/datum/quirk/system_shock/add(client/client_source) + if(issynthetic(quirk_holder)) + RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) + +/datum/quirk/system_shock/remove() + UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) + + +/datum/quirk/system_shock/proc/on_electrocute() + SIGNAL_HANDLER + var/knockout_length = 0.9 SECONDS + rand(0 SECONDS, 0.5 SECONDS) + quirk_holder.set_static_vision(knockout_length) + quirk_holder.balloon_alert(quirk_holder, "system rebooting") + to_chat(quirk_holder, span_danger("CRIT&!AL ERR%R: S#STEM REBO#TING.")) + addtimer(CALLBACK(src, PROC_REF(knock_out), knockout_length - 0.4 SECONDS), 2 SECONDS) + //The intent with the 0.4 seconds is so that the visual static effect lasts longer than the actual knockout/sleeping effect. + +/datum/quirk/system_shock/proc/knock_out(var/length) + quirk_holder.Sleeping(length) From 55f9ff11fbc8e0a673d1330e3a03b9d3e3bf1a1d Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:33:36 -0600 Subject: [PATCH 08/57] Rename system_shock_quirk.dm to system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- .../negative_quirks/{system_shock_quirk.dm => system_shock.dm} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename code/datums/quirks/negative_quirks/{system_shock_quirk.dm => system_shock.dm} (100%) diff --git a/code/datums/quirks/negative_quirks/system_shock_quirk.dm b/code/datums/quirks/negative_quirks/system_shock.dm similarity index 100% rename from code/datums/quirks/negative_quirks/system_shock_quirk.dm rename to code/datums/quirks/negative_quirks/system_shock.dm From 696ac67bb96af94d524f2000e8a7cff59aac8572 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:35:39 -0600 Subject: [PATCH 09/57] Update tgstation.dme Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- tgstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/tgstation.dme b/tgstation.dme index 4d047136317d3..c23aafb530daf 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1846,6 +1846,7 @@ #include "code\datums\quirks\negative_quirks\tin_man.dm" #include "code\datums\quirks\negative_quirks\unstable.dm" #include "code\datums\quirks\negative_quirks\unusual.dm" +#include "code\datums\quirks\negative_quirks\system_shock.dm" #include "code\datums\quirks\neutral_quirks\bald.dm" #include "code\datums\quirks\neutral_quirks\borg_ready.dm" #include "code\datums\quirks\neutral_quirks\colorist.dm" From 86519b1bc01c1d34c7d33f0c37956a94ab0e2364 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:19:03 -0600 Subject: [PATCH 10/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 510affb437924..a3ba11c49fee1 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -10,7 +10,7 @@ quirk_flags = QUIRK_HUMAN_ONLY /datum/quirk/system_shock/add(client/client_source) - if(issynthetic(quirk_holder)) + if(SPECIES_ANDROID) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) /datum/quirk/system_shock/remove() @@ -19,7 +19,7 @@ /datum/quirk/system_shock/proc/on_electrocute() SIGNAL_HANDLER - var/knockout_length = 0.9 SECONDS + rand(0 SECONDS, 0.5 SECONDS) + var/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) quirk_holder.set_static_vision(knockout_length) quirk_holder.balloon_alert(quirk_holder, "system rebooting") to_chat(quirk_holder, span_danger("CRIT&!AL ERR%R: S#STEM REBO#TING.")) From 356a799a801b4b3fd39850eb7c85625acdbe51c8 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 17:36:07 -0600 Subject: [PATCH 11/57] Update tgstation.dme reordered the includes ? Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- tgstation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index c23aafb530daf..4435d870a9bea 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1843,10 +1843,10 @@ #include "code\datums\quirks\negative_quirks\scarred_eye.dm" #include "code\datums\quirks\negative_quirks\social_anxiety.dm" #include "code\datums\quirks\negative_quirks\softspoken.dm" +#include "code\datums\quirks\negative_quirks\system_shock.dm" #include "code\datums\quirks\negative_quirks\tin_man.dm" #include "code\datums\quirks\negative_quirks\unstable.dm" #include "code\datums\quirks\negative_quirks\unusual.dm" -#include "code\datums\quirks\negative_quirks\system_shock.dm" #include "code\datums\quirks\neutral_quirks\bald.dm" #include "code\datums\quirks\neutral_quirks\borg_ready.dm" #include "code\datums\quirks\neutral_quirks\colorist.dm" From c0cd1a5d841aea178667552f41315bf3a478d52e Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 17:55:34 -0600 Subject: [PATCH 12/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index a3ba11c49fee1..1b6d69738ab67 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -12,7 +12,7 @@ /datum/quirk/system_shock/add(client/client_source) if(SPECIES_ANDROID) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) - + } else { /datum/quirk/system_shock/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) From e92cda65551642bdcb78a84172217b28c0ac1d9c Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:04:54 -0600 Subject: [PATCH 13/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 1b6d69738ab67..40f25f9bd3009 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -12,7 +12,7 @@ /datum/quirk/system_shock/add(client/client_source) if(SPECIES_ANDROID) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) - } else { + } else if(iscarbon(user)) /datum/quirk/system_shock/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) From ff37c7218019fd8a45ed90b861205fe95a980747 Mon Sep 17 00:00:00 2001 From: K3Licia <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:17:43 -0600 Subject: [PATCH 14/57] Update system_shock.dm --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 40f25f9bd3009..a3ba11c49fee1 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -12,7 +12,7 @@ /datum/quirk/system_shock/add(client/client_source) if(SPECIES_ANDROID) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) - } else if(iscarbon(user)) + /datum/quirk/system_shock/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) From 8745bf874e0ebf26b58759557e8aca2a25dc5788 Mon Sep 17 00:00:00 2001 From: K3Licia <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:17:58 -0600 Subject: [PATCH 15/57] Revert "Update system_shock.dm" This reverts commit ff37c7218019fd8a45ed90b861205fe95a980747. --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index a3ba11c49fee1..40f25f9bd3009 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -12,7 +12,7 @@ /datum/quirk/system_shock/add(client/client_source) if(SPECIES_ANDROID) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) - + } else if(iscarbon(user)) /datum/quirk/system_shock/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) From cdaa01b9a13313428773c64a154db9d01da19185 Mon Sep 17 00:00:00 2001 From: K3Licia <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:18:44 -0600 Subject: [PATCH 16/57] Revert "Update system_shock.dm" This reverts commit e92cda65551642bdcb78a84172217b28c0ac1d9c. --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 40f25f9bd3009..1b6d69738ab67 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -12,7 +12,7 @@ /datum/quirk/system_shock/add(client/client_source) if(SPECIES_ANDROID) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) - } else if(iscarbon(user)) + } else { /datum/quirk/system_shock/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) From 2a7c533a89042ad808e3e6781b0475e2cb7d30f9 Mon Sep 17 00:00:00 2001 From: K3Licia <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:18:55 -0600 Subject: [PATCH 17/57] Revert "Update system_shock.dm" This reverts commit c0cd1a5d841aea178667552f41315bf3a478d52e. --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 1b6d69738ab67..a3ba11c49fee1 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -12,7 +12,7 @@ /datum/quirk/system_shock/add(client/client_source) if(SPECIES_ANDROID) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) - } else { + /datum/quirk/system_shock/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) From 993136e26935aba84e39a06718b23991208f1292 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:31:59 -0600 Subject: [PATCH 18/57] crying my eyes out Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index a3ba11c49fee1..a2a7403501aeb 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -19,7 +19,7 @@ /datum/quirk/system_shock/proc/on_electrocute() SIGNAL_HANDLER - var/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) + knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) quirk_holder.set_static_vision(knockout_length) quirk_holder.balloon_alert(quirk_holder, "system rebooting") to_chat(quirk_holder, span_danger("CRIT&!AL ERR%R: S#STEM REBO#TING.")) From 7728b6ce85b7a912e43ad622c8b82b8e2e5f4913 Mon Sep 17 00:00:00 2001 From: K3Licia <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:39:06 -0600 Subject: [PATCH 19/57] Revert "crying my eyes out" This reverts commit 993136e26935aba84e39a06718b23991208f1292. --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index a2a7403501aeb..a3ba11c49fee1 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -19,7 +19,7 @@ /datum/quirk/system_shock/proc/on_electrocute() SIGNAL_HANDLER - knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) + var/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) quirk_holder.set_static_vision(knockout_length) quirk_holder.balloon_alert(quirk_holder, "system rebooting") to_chat(quirk_holder, span_danger("CRIT&!AL ERR%R: S#STEM REBO#TING.")) From 7478a0f59bffe20cfae30e8a193317bb733d0945 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:44:58 -0600 Subject: [PATCH 20/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index a3ba11c49fee1..e8fbe1dcb615b 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -10,7 +10,7 @@ quirk_flags = QUIRK_HUMAN_ONLY /datum/quirk/system_shock/add(client/client_source) - if(SPECIES_ANDROID) + if(SPECIES_ANDROID(quirk_holder)) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) /datum/quirk/system_shock/remove() From 3478a600adbd8d8af28c5f2e9683b68a41709211 Mon Sep 17 00:00:00 2001 From: K3Licia <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:48:20 -0600 Subject: [PATCH 21/57] Revert "Update system_shock.dm" This reverts commit 7478a0f59bffe20cfae30e8a193317bb733d0945. --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index e8fbe1dcb615b..a3ba11c49fee1 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -10,7 +10,7 @@ quirk_flags = QUIRK_HUMAN_ONLY /datum/quirk/system_shock/add(client/client_source) - if(SPECIES_ANDROID(quirk_holder)) + if(SPECIES_ANDROID) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) /datum/quirk/system_shock/remove() From b101fd5cff71430ea9e6d550a24d8dda546f0ce3 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:58:53 -0600 Subject: [PATCH 22/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index a3ba11c49fee1..2e55ed1934816 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -16,7 +16,6 @@ /datum/quirk/system_shock/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) - /datum/quirk/system_shock/proc/on_electrocute() SIGNAL_HANDLER var/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) From 49c5d0ab1936da6b23435413d7ae1c6e4a73a5ca Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Thu, 28 Nov 2024 00:31:28 -0600 Subject: [PATCH 23/57] trying again... Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 2e55ed1934816..0c08da0389fd1 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -10,12 +10,13 @@ quirk_flags = QUIRK_HUMAN_ONLY /datum/quirk/system_shock/add(client/client_source) - if(SPECIES_ANDROID) - RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) + if(var/SPECIES_ANDROID), RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute) -/datum/quirk/system_shock/remove() + else +/datum/quirk/system_shock/remove(TRAIT_SYSTEM_SHOCK) UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) + /datum/quirk/system_shock/proc/on_electrocute() SIGNAL_HANDLER var/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) From 74cb4c424c5f7c699294421d741929dc9ae1a432 Mon Sep 17 00:00:00 2001 From: K3Licia <135052649+K3Licia@users.noreply.github.com> Date: Thu, 28 Nov 2024 00:33:59 -0600 Subject: [PATCH 24/57] Revert "trying again..." This reverts commit 49c5d0ab1936da6b23435413d7ae1c6e4a73a5ca. --- code/datums/quirks/negative_quirks/system_shock.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 0c08da0389fd1..2e55ed1934816 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -10,13 +10,12 @@ quirk_flags = QUIRK_HUMAN_ONLY /datum/quirk/system_shock/add(client/client_source) - if(var/SPECIES_ANDROID), RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute) + if(SPECIES_ANDROID) + RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) - else -/datum/quirk/system_shock/remove(TRAIT_SYSTEM_SHOCK) +/datum/quirk/system_shock/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) - /datum/quirk/system_shock/proc/on_electrocute() SIGNAL_HANDLER var/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) From 3126d41d27138739daf69d5ddeef9d99d159ffc7 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Thu, 28 Nov 2024 00:34:43 -0600 Subject: [PATCH 25/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 2e55ed1934816..519f83195dccf 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -10,7 +10,7 @@ quirk_flags = QUIRK_HUMAN_ONLY /datum/quirk/system_shock/add(client/client_source) - if(SPECIES_ANDROID) + if(var/SPECIES_ANDROID) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) /datum/quirk/system_shock/remove() From 70be7ac2ca8f1bf24576d24c54af8a24b37a146b Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Thu, 28 Nov 2024 00:36:59 -0600 Subject: [PATCH 26/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 519f83195dccf..860131859c6f7 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -10,8 +10,7 @@ quirk_flags = QUIRK_HUMAN_ONLY /datum/quirk/system_shock/add(client/client_source) - if(var/SPECIES_ANDROID) - RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) + if(var/SPECIES_ANDROID) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) /datum/quirk/system_shock/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) From d37a5fdf010fbb914826fe271ede6b1cc53b25c8 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Thu, 28 Nov 2024 00:48:36 -0600 Subject: [PATCH 27/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 860131859c6f7..4e4654cf45e71 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -10,7 +10,8 @@ quirk_flags = QUIRK_HUMAN_ONLY /datum/quirk/system_shock/add(client/client_source) - if(var/SPECIES_ANDROID) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) + if(-SPECIES_ANDROID) + RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) /datum/quirk/system_shock/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) From aa83106a8279a670aec16798d59e7c30a9e1c9d1 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Thu, 28 Nov 2024 00:57:18 -0600 Subject: [PATCH 28/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 4e4654cf45e71..a3ba11c49fee1 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -10,12 +10,13 @@ quirk_flags = QUIRK_HUMAN_ONLY /datum/quirk/system_shock/add(client/client_source) - if(-SPECIES_ANDROID) - RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) + if(SPECIES_ANDROID) + RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) /datum/quirk/system_shock/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) + /datum/quirk/system_shock/proc/on_electrocute() SIGNAL_HANDLER var/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) From 5e79dde0a08105f384577e0ab18d48c95f8b0a58 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Thu, 28 Nov 2024 01:02:07 -0600 Subject: [PATCH 29/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index a3ba11c49fee1..702dc2b296faf 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -19,7 +19,7 @@ /datum/quirk/system_shock/proc/on_electrocute() SIGNAL_HANDLER - var/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) + proc/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) quirk_holder.set_static_vision(knockout_length) quirk_holder.balloon_alert(quirk_holder, "system rebooting") to_chat(quirk_holder, span_danger("CRIT&!AL ERR%R: S#STEM REBO#TING.")) From afef643bdef81474075a3b32ce30e11161be1eff Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Thu, 28 Nov 2024 01:05:33 -0600 Subject: [PATCH 30/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 702dc2b296faf..a3ba11c49fee1 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -19,7 +19,7 @@ /datum/quirk/system_shock/proc/on_electrocute() SIGNAL_HANDLER - proc/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) + var/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) quirk_holder.set_static_vision(knockout_length) quirk_holder.balloon_alert(quirk_holder, "system rebooting") to_chat(quirk_holder, span_danger("CRIT&!AL ERR%R: S#STEM REBO#TING.")) From 0bd887e74e78808c2656118770789648d76d9596 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Thu, 28 Nov 2024 23:12:26 -0600 Subject: [PATCH 31/57] Update code/datums/quirks/negative_quirks/system_shock.dm Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com> Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index a3ba11c49fee1..85e7a2e7043d9 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -10,7 +10,7 @@ quirk_flags = QUIRK_HUMAN_ONLY /datum/quirk/system_shock/add(client/client_source) - if(SPECIES_ANDROID) + if(isandroid(quirk_holder)) RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) /datum/quirk/system_shock/remove() From 2202ce742e78f73d69e87e0f76a7115b65ba2b60 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Thu, 28 Nov 2024 23:12:32 -0600 Subject: [PATCH 32/57] Update code/datums/quirks/negative_quirks/system_shock.dm Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com> Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 85e7a2e7043d9..14709a986e562 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -26,5 +26,5 @@ addtimer(CALLBACK(src, PROC_REF(knock_out), knockout_length - 0.4 SECONDS), 2 SECONDS) //The intent with the 0.4 seconds is so that the visual static effect lasts longer than the actual knockout/sleeping effect. -/datum/quirk/system_shock/proc/knock_out(var/length) +/datum/quirk/system_shock/proc/knock_out(length) quirk_holder.Sleeping(length) From 3d659bc5d28508d63d734822709bbf951f9af39b Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:11:01 -0600 Subject: [PATCH 33/57] Update _traits.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/_globalvars/traits/_traits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index a260cd4717a0a..399f12d91f551 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -352,7 +352,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_MULTIZ_SUIT_SENSORS" = TRAIT_MULTIZ_SUIT_SENSORS, "TRAIT_MUSICIAN" = TRAIT_MUSICIAN, "TRAIT_MUTANT_COLORS" = TRAIT_MUTANT_COLORS, - "TRAIT_SYSTEM_SHOCK" = TRAIT_SYSTEM_SHOCK, "TRAIT_MUTE" = TRAIT_MUTE, "TRAIT_NAIVE" = TRAIT_NAIVE, "TRAIT_NEARSIGHTED_CORRECTED" = TRAIT_NEARSIGHTED_CORRECTED, @@ -579,6 +578,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_IGNORE_FIRE_PROTECTION" = TRAIT_IGNORE_FIRE_PROTECTION, "TRAIT_LEFT_EYE_SCAR" = TRAIT_LEFT_EYE_SCAR, "TRAIT_RIGHT_EYE_SCAR" = TRAIT_RIGHT_EYE_SCAR, + "TRAIT_SYSTEM_SHOCK" = TRAIT_SYSTEM_SHOCK, // DOPPLER EDIT ADDITION ), /obj/item = list( "TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING, From b5ed9e547c28be689ac99b7ad563d114a8b9cc62 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:11:57 -0600 Subject: [PATCH 34/57] Update admin_tooling.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/_globalvars/traits/admin_tooling.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm index 0eb0e171b48b6..92818a74a4a09 100644 --- a/code/_globalvars/traits/admin_tooling.dm +++ b/code/_globalvars/traits/admin_tooling.dm @@ -111,7 +111,6 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_FISH_EATER" = TRAIT_FISH_EATER, "TRAIT_FIST_MINING" = TRAIT_FIST_MINING, "TRAIT_FIXED_MUTANT_COLORS" = TRAIT_FIXED_MUTANT_COLORS, - "TRAIT_SYSTEM_SHOCK" = TRAIT_SYSTEM_SHOCK, "TRAIT_FLESH_DESIRE" = TRAIT_FLESH_DESIRE, "TRAIT_FLOORED" = TRAIT_FLOORED, "TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION" = TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION, @@ -334,6 +333,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_IGNORE_FIRE_PROTECTION" = TRAIT_IGNORE_FIRE_PROTECTION, "TRAIT_LEFT_EYE_SCAR" = TRAIT_LEFT_EYE_SCAR, "TRAIT_RIGHT_EYE_SCAR" = TRAIT_RIGHT_EYE_SCAR, + "TRAIT_SYSTEM_SHOCK" = TRAIT_SYSTEM_SHOCK, // DOPPLER EDIT ADDITION ), /obj/item = list( "TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING, From 8ba289bd8b665b09f99ef147c907112a6b829554 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:12:43 -0600 Subject: [PATCH 35/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index 14709a986e562..f32d384194c2f 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -23,8 +23,8 @@ quirk_holder.set_static_vision(knockout_length) quirk_holder.balloon_alert(quirk_holder, "system rebooting") to_chat(quirk_holder, span_danger("CRIT&!AL ERR%R: S#STEM REBO#TING.")) - addtimer(CALLBACK(src, PROC_REF(knock_out), knockout_length - 0.4 SECONDS), 2 SECONDS) //The intent with the 0.4 seconds is so that the visual static effect lasts longer than the actual knockout/sleeping effect. + addtimer(CALLBACK(src, PROC_REF(knock_out), knockout_length - 0.4 SECONDS), 2 SECONDS) /datum/quirk/system_shock/proc/knock_out(length) quirk_holder.Sleeping(length) From 353ae0c4a227905eb7f95e65de27c3fc8f2fcae7 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:14:03 -0600 Subject: [PATCH 36/57] Update MMI.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/modules/mob/living/brain/MMI.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index dbfb2a791573d..fe9727df032ea 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -290,7 +290,7 @@ if(3) brainmob.emp_damage = min(brainmob.emp_damage + rand(0,10), 30) brainmob.emote("alarm") - SEND_SIGNAL(brainmob, COMSIG_LIVING_MINOR_SHOCK) // NOVA EDIT ADDITION + SEND_SIGNAL(brainmob, COMSIG_LIVING_MINOR_SHOCK) /obj/item/mmi/atom_deconstruct(disassembled = TRUE) if(brain) From 80db9f28e8caaf6cb085b0c5587b59f3c6c07ba8 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:14:23 -0600 Subject: [PATCH 37/57] Update generic.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/game/objects/items/robot/items/generic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/robot/items/generic.dm b/code/game/objects/items/robot/items/generic.dm index 089f79af72605..f9af555ea35de 100644 --- a/code/game/objects/items/robot/items/generic.dm +++ b/code/game/objects/items/robot/items/generic.dm @@ -54,7 +54,7 @@ span_userdanger("[user] prods you with [src]!"), ) - SEND_SIGNAL(attacked_mob, COMSIG_LIVING_MINOR_SHOCK) // NOVA EDIT ADDITION + SEND_SIGNAL(attacked_mob, COMSIG_LIVING_MINOR_SHOCK) playsound(loc, 'sound/items/weapons/egloves.ogg', 50, TRUE, -1) cooldown_check = world.time + cooldown log_combat(user, attacked_mob, "stunned", src, "(Combat mode: [user.combat_mode ? "On" : "Off"])") From 3cde523334bac9f83a34f403db598bf5236e4bb1 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:17:18 -0600 Subject: [PATCH 38/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/datums/quirks/negative_quirks/system_shock.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm index f32d384194c2f..abfc8556bc7ab 100644 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ b/code/datums/quirks/negative_quirks/system_shock.dm @@ -26,5 +26,6 @@ //The intent with the 0.4 seconds is so that the visual static effect lasts longer than the actual knockout/sleeping effect. addtimer(CALLBACK(src, PROC_REF(knock_out), knockout_length - 0.4 SECONDS), 2 SECONDS) +///The length at which unconsciousness lasts during system shock. /datum/quirk/system_shock/proc/knock_out(length) quirk_holder.Sleeping(length) From bc88256a301750fda10435613858f47b58fb713b Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:32:43 -0600 Subject: [PATCH 39/57] Delete code/datums/quirks/negative_quirks/system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- .../quirks/negative_quirks/system_shock.dm | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 code/datums/quirks/negative_quirks/system_shock.dm diff --git a/code/datums/quirks/negative_quirks/system_shock.dm b/code/datums/quirks/negative_quirks/system_shock.dm deleted file mode 100644 index abfc8556bc7ab..0000000000000 --- a/code/datums/quirks/negative_quirks/system_shock.dm +++ /dev/null @@ -1,31 +0,0 @@ -/datum/quirk/system_shock - name = "System Shock" - desc = "You and electricity have a volatile relationship. One spark's liable to forcefully reboot your systems. Note: This quirk only works on synths." - gain_text = span_danger("You start feeling nervous around plug sockets.") - lose_text = span_notice("You feel normal about sparks.") - medical_record_text = "Patient's processors are unusually uninsulated." - value = -8 - mob_trait = TRAIT_SYSTEM_SHOCK - icon = FA_ICON_PLUG_CIRCLE_XMARK - quirk_flags = QUIRK_HUMAN_ONLY - -/datum/quirk/system_shock/add(client/client_source) - if(isandroid(quirk_holder)) - RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) - -/datum/quirk/system_shock/remove() - UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) - - -/datum/quirk/system_shock/proc/on_electrocute() - SIGNAL_HANDLER - var/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) - quirk_holder.set_static_vision(knockout_length) - quirk_holder.balloon_alert(quirk_holder, "system rebooting") - to_chat(quirk_holder, span_danger("CRIT&!AL ERR%R: S#STEM REBO#TING.")) - //The intent with the 0.4 seconds is so that the visual static effect lasts longer than the actual knockout/sleeping effect. - addtimer(CALLBACK(src, PROC_REF(knock_out), knockout_length - 0.4 SECONDS), 2 SECONDS) - -///The length at which unconsciousness lasts during system shock. -/datum/quirk/system_shock/proc/knock_out(length) - quirk_holder.Sleeping(length) From 38d52b6e130a21aea44c8167cabd0401a3cce1d0 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:33:30 -0600 Subject: [PATCH 40/57] Add files via upload making it modular (?) hopefully Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- .../system_shock/system_shock.dm | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 modular_doppler/modular_quirks/system_shock/system_shock.dm diff --git a/modular_doppler/modular_quirks/system_shock/system_shock.dm b/modular_doppler/modular_quirks/system_shock/system_shock.dm new file mode 100644 index 0000000000000..abfc8556bc7ab --- /dev/null +++ b/modular_doppler/modular_quirks/system_shock/system_shock.dm @@ -0,0 +1,31 @@ +/datum/quirk/system_shock + name = "System Shock" + desc = "You and electricity have a volatile relationship. One spark's liable to forcefully reboot your systems. Note: This quirk only works on synths." + gain_text = span_danger("You start feeling nervous around plug sockets.") + lose_text = span_notice("You feel normal about sparks.") + medical_record_text = "Patient's processors are unusually uninsulated." + value = -8 + mob_trait = TRAIT_SYSTEM_SHOCK + icon = FA_ICON_PLUG_CIRCLE_XMARK + quirk_flags = QUIRK_HUMAN_ONLY + +/datum/quirk/system_shock/add(client/client_source) + if(isandroid(quirk_holder)) + RegisterSignals(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK), PROC_REF(on_electrocute)) + +/datum/quirk/system_shock/remove() + UnregisterSignal(quirk_holder, list(COMSIG_LIVING_ELECTROCUTE_ACT, COMSIG_LIVING_MINOR_SHOCK)) + + +/datum/quirk/system_shock/proc/on_electrocute() + SIGNAL_HANDLER + var/knockout_length = 20 SECONDS + rand(0 SECONDS, 5 SECONDS) + quirk_holder.set_static_vision(knockout_length) + quirk_holder.balloon_alert(quirk_holder, "system rebooting") + to_chat(quirk_holder, span_danger("CRIT&!AL ERR%R: S#STEM REBO#TING.")) + //The intent with the 0.4 seconds is so that the visual static effect lasts longer than the actual knockout/sleeping effect. + addtimer(CALLBACK(src, PROC_REF(knock_out), knockout_length - 0.4 SECONDS), 2 SECONDS) + +///The length at which unconsciousness lasts during system shock. +/datum/quirk/system_shock/proc/knock_out(length) + quirk_holder.Sleeping(length) From 62c51cf681135fc41d6d6bb96479976bfc143a6d Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:35:28 -0600 Subject: [PATCH 41/57] Update declarations.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/__DEFINES/traits/declarations.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index d892b185ed706..64e5031cd667a 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -71,8 +71,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai // Antagonizes the above. #define TRAIT_DISCOORDINATED_TOOL_USER "discoordinated_tool_user" #define TRAIT_PACIFISM "pacifism" -/// The trait that determines if someone has the system shock quirk. -#define TRAIT_SYSTEM_SHOCK "trait_system_shock" // Trait added to the user of a hippocratic oath status effect #define TRAIT_HIPPOCRATIC_OATH "hippocratic_oath" #define TRAIT_IGNORESLOWDOWN "ignoreslow" From 3d4c5a994e6e71336826a5581e21eb63eb3dbf4b Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:36:05 -0600 Subject: [PATCH 42/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- modular_doppler/modular_quirks/system_shock/system_shock.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modular_doppler/modular_quirks/system_shock/system_shock.dm b/modular_doppler/modular_quirks/system_shock/system_shock.dm index abfc8556bc7ab..75f7a172005f5 100644 --- a/modular_doppler/modular_quirks/system_shock/system_shock.dm +++ b/modular_doppler/modular_quirks/system_shock/system_shock.dm @@ -1,3 +1,6 @@ +/// The trait that determines if someone has the system shock quirk. +#define TRAIT_SYSTEM_SHOCK "trait_system_shock" + /datum/quirk/system_shock name = "System Shock" desc = "You and electricity have a volatile relationship. One spark's liable to forcefully reboot your systems. Note: This quirk only works on synths." From eb2b4df2099f7d7ac09cf2636c61f54b12dff8d7 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:43:44 -0600 Subject: [PATCH 43/57] Update tgstation.dme Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- tgstation.dme | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tgstation.dme b/tgstation.dme index 4435d870a9bea..6d1769cff3158 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1843,7 +1843,6 @@ #include "code\datums\quirks\negative_quirks\scarred_eye.dm" #include "code\datums\quirks\negative_quirks\social_anxiety.dm" #include "code\datums\quirks\negative_quirks\softspoken.dm" -#include "code\datums\quirks\negative_quirks\system_shock.dm" #include "code\datums\quirks\negative_quirks\tin_man.dm" #include "code\datums\quirks\negative_quirks\unstable.dm" #include "code\datums\quirks\negative_quirks\unusual.dm" @@ -5218,7 +5217,7 @@ #include "code\modules\mob\living\basic\vermin\mothroach\mothroach.dm" #include "code\modules\mob\living\basic\vermin\mothroach\mothroach_ai.dm" #include "code\modules\mob\living\brain\brain.dm" -#include "code\modules\mob\living\brain\brain_cybernetic.dm" +#include "code\modules\mob\living\brain\brain_.dm" #include "code\modules\mob\living\brain\brain_item.dm" #include "code\modules\mob\living\brain\brain_say.dm" #include "code\modules\mob\living\brain\death.dm" @@ -7055,6 +7054,7 @@ #include "modular_doppler\modular_quirks\paycheck_rations\code\tickets.dm" #include "modular_doppler\modular_quirks\permitted_cybernetic\permitted_cybernetic.dm" #include "modular_doppler\modular_quirks\permitted_cybernetic\code\preferences.dm" +#include "modular_doppler\modular_quirks\system_shock\system_shock.dm" #include "modular_doppler\modular_sounds\code\sounds.dm" #include "modular_doppler\modular_species\_species.dm" #include "modular_doppler\modular_species\code\bloodsplatter.dm" From 7e4b2a7f40ea6f8089ff02595ee40992bff413ff Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:48:25 -0600 Subject: [PATCH 44/57] Update tgstation.dme Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- tgstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 6d1769cff3158..3811e9f7efabc 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5217,7 +5217,6 @@ #include "code\modules\mob\living\basic\vermin\mothroach\mothroach.dm" #include "code\modules\mob\living\basic\vermin\mothroach\mothroach_ai.dm" #include "code\modules\mob\living\brain\brain.dm" -#include "code\modules\mob\living\brain\brain_.dm" #include "code\modules\mob\living\brain\brain_item.dm" #include "code\modules\mob\living\brain\brain_say.dm" #include "code\modules\mob\living\brain\death.dm" From 99003b87f3f5dfda925e0036763f63f829c8b927 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 13:10:47 -0600 Subject: [PATCH 45/57] Update tgstation.dme Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- tgstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/tgstation.dme b/tgstation.dme index 3811e9f7efabc..957fd47b5c282 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5217,6 +5217,7 @@ #include "code\modules\mob\living\basic\vermin\mothroach\mothroach.dm" #include "code\modules\mob\living\basic\vermin\mothroach\mothroach_ai.dm" #include "code\modules\mob\living\brain\brain.dm" +#include "code\modules\mob\living\brain\brain_cybernetic.dm" #include "code\modules\mob\living\brain\brain_item.dm" #include "code\modules\mob\living\brain\brain_say.dm" #include "code\modules\mob\living\brain\death.dm" From 128ff7f1ee8ce7c18eebf7a6c950d58e5a844fa1 Mon Sep 17 00:00:00 2001 From: K3Licia <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 13:17:07 -0600 Subject: [PATCH 46/57] Revert "Update declarations.dm" This reverts commit 62c51cf681135fc41d6d6bb96479976bfc143a6d. --- code/__DEFINES/traits/declarations.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index 64e5031cd667a..d892b185ed706 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -71,6 +71,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai // Antagonizes the above. #define TRAIT_DISCOORDINATED_TOOL_USER "discoordinated_tool_user" #define TRAIT_PACIFISM "pacifism" +/// The trait that determines if someone has the system shock quirk. +#define TRAIT_SYSTEM_SHOCK "trait_system_shock" // Trait added to the user of a hippocratic oath status effect #define TRAIT_HIPPOCRATIC_OATH "hippocratic_oath" #define TRAIT_IGNORESLOWDOWN "ignoreslow" From 98b7e8aa749faa5fa5d861500406ecee4a148f7e Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 13:19:05 -0600 Subject: [PATCH 47/57] Update system_shock.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- modular_doppler/modular_quirks/system_shock/system_shock.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/modular_doppler/modular_quirks/system_shock/system_shock.dm b/modular_doppler/modular_quirks/system_shock/system_shock.dm index 75f7a172005f5..abfc8556bc7ab 100644 --- a/modular_doppler/modular_quirks/system_shock/system_shock.dm +++ b/modular_doppler/modular_quirks/system_shock/system_shock.dm @@ -1,6 +1,3 @@ -/// The trait that determines if someone has the system shock quirk. -#define TRAIT_SYSTEM_SHOCK "trait_system_shock" - /datum/quirk/system_shock name = "System Shock" desc = "You and electricity have a volatile relationship. One spark's liable to forcefully reboot your systems. Note: This quirk only works on synths." From 5d6fb3826c5fa5052ee614b423b920dad9f85e22 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:06:06 -0600 Subject: [PATCH 48/57] Add files via upload Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/__DEFINES/~doppler_defines/traits/declarations.dm | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 code/__DEFINES/~doppler_defines/traits/declarations.dm diff --git a/code/__DEFINES/~doppler_defines/traits/declarations.dm b/code/__DEFINES/~doppler_defines/traits/declarations.dm new file mode 100644 index 0000000000000..e69de29bb2d1d From 2d1aef61309601fa0f70c2eecca3a4c08108e6ab Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:08:13 -0600 Subject: [PATCH 49/57] Update declarations.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/__DEFINES/traits/declarations.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index d892b185ed706..64e5031cd667a 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -71,8 +71,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai // Antagonizes the above. #define TRAIT_DISCOORDINATED_TOOL_USER "discoordinated_tool_user" #define TRAIT_PACIFISM "pacifism" -/// The trait that determines if someone has the system shock quirk. -#define TRAIT_SYSTEM_SHOCK "trait_system_shock" // Trait added to the user of a hippocratic oath status effect #define TRAIT_HIPPOCRATIC_OATH "hippocratic_oath" #define TRAIT_IGNORESLOWDOWN "ignoreslow" From d58fa1527a2b763f7c93be49e81486b148a7bb07 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:09:24 -0600 Subject: [PATCH 50/57] Update declarations.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/__DEFINES/~doppler_defines/traits/declarations.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/__DEFINES/~doppler_defines/traits/declarations.dm b/code/__DEFINES/~doppler_defines/traits/declarations.dm index e69de29bb2d1d..9323478bc6d27 100644 --- a/code/__DEFINES/~doppler_defines/traits/declarations.dm +++ b/code/__DEFINES/~doppler_defines/traits/declarations.dm @@ -0,0 +1,2 @@ +/// The trait that determines if someone has the system shock quirk. +#define TRAIT_SYSTEM_SHOCK "trait_system_shock" From ae050229e2e431864cd15ff3cd8d9ef5ddf5e040 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:13:11 -0600 Subject: [PATCH 51/57] Update declarations.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/__DEFINES/~doppler_defines/traits/declarations.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/__DEFINES/~doppler_defines/traits/declarations.dm b/code/__DEFINES/~doppler_defines/traits/declarations.dm index 9323478bc6d27..391336f06072b 100644 --- a/code/__DEFINES/~doppler_defines/traits/declarations.dm +++ b/code/__DEFINES/~doppler_defines/traits/declarations.dm @@ -1,2 +1,3 @@ /// The trait that determines if someone has the system shock quirk. #define TRAIT_SYSTEM_SHOCK "trait_system_shock" + From d07248a7086d8096ecc57a78491fd43a788674a3 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:14:58 -0600 Subject: [PATCH 52/57] Update generic.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/game/objects/items/robot/items/generic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/robot/items/generic.dm b/code/game/objects/items/robot/items/generic.dm index f9af555ea35de..894135c7ef468 100644 --- a/code/game/objects/items/robot/items/generic.dm +++ b/code/game/objects/items/robot/items/generic.dm @@ -54,7 +54,7 @@ span_userdanger("[user] prods you with [src]!"), ) - SEND_SIGNAL(attacked_mob, COMSIG_LIVING_MINOR_SHOCK) + SEND_SIGNAL(attacked_mob, COMSIG_LIVING_MINOR_SHOCK) // DOPPLER EDIT ADDITION playsound(loc, 'sound/items/weapons/egloves.ogg', 50, TRUE, -1) cooldown_check = world.time + cooldown log_combat(user, attacked_mob, "stunned", src, "(Combat mode: [user.combat_mode ? "On" : "Off"])") From abd05386d4b0275c0dffac0b6ede74f20068afd6 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:15:31 -0600 Subject: [PATCH 53/57] Update MMI.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/modules/mob/living/brain/MMI.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index fe9727df032ea..35ede57d31d43 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -290,7 +290,7 @@ if(3) brainmob.emp_damage = min(brainmob.emp_damage + rand(0,10), 30) brainmob.emote("alarm") - SEND_SIGNAL(brainmob, COMSIG_LIVING_MINOR_SHOCK) + SEND_SIGNAL(brainmob, COMSIG_LIVING_MINOR_SHOCK) // DOPPLER EDIT ADDITION /obj/item/mmi/atom_deconstruct(disassembled = TRUE) if(brain) From a6f1111654654f998d51136007a24a16a9b29114 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:36:27 -0600 Subject: [PATCH 54/57] Update tgstation.dme Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- tgstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/tgstation.dme b/tgstation.dme index 957fd47b5c282..a5e083dede36a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -444,6 +444,7 @@ #include "code\__DEFINES\~doppler_defines\traits.dm" #include "code\__DEFINES\~doppler_defines\vv.dm" #include "code\__DEFINES\~doppler_defines\wounds.dm" +#include "code\__DEFINES\~doppler_defines\traits\declarations.dm." #include "code\__HELPERS\_auxtools_api.dm" #include "code\__HELPERS\_dreamluau.dm" #include "code\__HELPERS\_lists.dm" From f9ac81d5a50e7530c354b1095064871776cc65c6 Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:42:16 -0600 Subject: [PATCH 55/57] Update tgstation.dme Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- tgstation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index a5e083dede36a..23f7189562ba6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -444,7 +444,7 @@ #include "code\__DEFINES\~doppler_defines\traits.dm" #include "code\__DEFINES\~doppler_defines\vv.dm" #include "code\__DEFINES\~doppler_defines\wounds.dm" -#include "code\__DEFINES\~doppler_defines\traits\declarations.dm." +#include "code\__DEFINES\~doppler_defines\traits\declarations.dm" #include "code\__HELPERS\_auxtools_api.dm" #include "code\__HELPERS\_dreamluau.dm" #include "code\__HELPERS\_lists.dm" From 1c1bb8df153fd8431b3e3e34cadb4628804ce97f Mon Sep 17 00:00:00 2001 From: K3L <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:44:52 -0600 Subject: [PATCH 56/57] Delete code/__DEFINES/~doppler_defines/traits/declarations.dm Signed-off-by: K3L <135052649+K3Licia@users.noreply.github.com> --- code/__DEFINES/~doppler_defines/traits/declarations.dm | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 code/__DEFINES/~doppler_defines/traits/declarations.dm diff --git a/code/__DEFINES/~doppler_defines/traits/declarations.dm b/code/__DEFINES/~doppler_defines/traits/declarations.dm deleted file mode 100644 index 391336f06072b..0000000000000 --- a/code/__DEFINES/~doppler_defines/traits/declarations.dm +++ /dev/null @@ -1,3 +0,0 @@ -/// The trait that determines if someone has the system shock quirk. -#define TRAIT_SYSTEM_SHOCK "trait_system_shock" - From 9788dd2423b8df956802e44c555950a54bcb797f Mon Sep 17 00:00:00 2001 From: K3Licia <135052649+K3Licia@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:46:48 -0600 Subject: [PATCH 57/57] Revert "Delete code/__DEFINES/~doppler_defines/traits/declarations.dm" This reverts commit 1c1bb8df153fd8431b3e3e34cadb4628804ce97f. --- code/__DEFINES/~doppler_defines/traits/declarations.dm | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 code/__DEFINES/~doppler_defines/traits/declarations.dm diff --git a/code/__DEFINES/~doppler_defines/traits/declarations.dm b/code/__DEFINES/~doppler_defines/traits/declarations.dm new file mode 100644 index 0000000000000..391336f06072b --- /dev/null +++ b/code/__DEFINES/~doppler_defines/traits/declarations.dm @@ -0,0 +1,3 @@ +/// The trait that determines if someone has the system shock quirk. +#define TRAIT_SYSTEM_SHOCK "trait_system_shock" +