From 172149d377b5ff7b4665f9258759d8ec31130161 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sat, 27 Jan 2024 13:21:29 -0500 Subject: [PATCH 1/3] shock biochip nerfs --- code/_onclick/click_override.dm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm index d17ef01694fd..5cf2e48d1cbe 100644 --- a/code/_onclick/click_override.dm +++ b/code/_onclick/click_override.dm @@ -71,7 +71,7 @@ var/atom/beam_from = user var/atom/target_atom = A - for(var/i in 0 to 3) + for(var/i in 0 to 2) beam_from.Beam(target_atom, icon_state = "lightning[rand(1, 12)]", icon = 'icons/effects/effects.dmi', time = 6) if(isliving(target_atom)) var/mob/living/L = target_atom @@ -81,7 +81,12 @@ L.adjustStaminaLoss(60) L.Jitter(10 SECONDS) var/atom/throw_target = get_edge_target_turf(user, get_dir(user, get_step_away(L, user))) - L.throw_at(throw_target, powergrid / 100000, powergrid / 100000) //100 kW in grid throws 1 tile, 200 throws 2, etc. + if(ishuman(L)) + var/mob/living/carbon/human/H = L + if(H.gloves && H.gloves.siemens_coefficient == 0) //No throwing with insulated gloves (you still get stamina however) + break + L.throw_at(throw_target, powergrid / 150000, powergrid / 300000) //150 kW in grid throws 1 tile, 300 throws 2, etc. + else add_attack_logs(user, L, "electrocuted with[P.unlimited_power ? " unlimited" : null] power bio-chip") if(P.unlimited_power) @@ -90,13 +95,13 @@ electrocute_mob(L, C.powernet, P) break var/list/next_shocked = list() - for(var/mob/M in range(3, target_atom)) //Try to jump to a mob first + for(var/mob/M in range(1, target_atom)) //Try to jump to a mob first if(M == user || isobserver(M)) continue next_shocked.Add(M) break //Break this so it gets the closest, thank you if(!length(next_shocked)) //No mob? Random bullshit go, try to get closer to a mob with luck - for(var/atom/movable/AM in orange(3, target_atom)) + for(var/atom/movable/AM in orange(1, target_atom)) if(AM == user || iseffect(AM) || isobserver(AM)) continue next_shocked.Add(AM) From a28602b02c278716ce2c69ed0a93c20de008a245 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sat, 27 Jan 2024 15:38:37 -0500 Subject: [PATCH 2/3] kw --- code/__DEFINES/power_defines.dm | 2 ++ code/_onclick/click_override.dm | 2 +- .../gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/power_defines.dm b/code/__DEFINES/power_defines.dm index 0a8694dbb1fb..15d4e1c1baa9 100644 --- a/code/__DEFINES/power_defines.dm +++ b/code/__DEFINES/power_defines.dm @@ -38,3 +38,5 @@ #define APC_IS_CHARGING 1 /// APC battery is at 100% #define APC_FULLY_CHARGED 2 + +#define KW *1000 diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm index 5cf2e48d1cbe..0df45684ee53 100644 --- a/code/_onclick/click_override.dm +++ b/code/_onclick/click_override.dm @@ -85,7 +85,7 @@ var/mob/living/carbon/human/H = L if(H.gloves && H.gloves.siemens_coefficient == 0) //No throwing with insulated gloves (you still get stamina however) break - L.throw_at(throw_target, powergrid / 150000, powergrid / 300000) //150 kW in grid throws 1 tile, 300 throws 2, etc. + L.throw_at(throw_target, powergrid / (150 KW), powergrid / (300 KW)) //150 kW in grid throws 1 tile, 300 throws 2, etc. else add_attack_logs(user, L, "electrocuted with[P.unlimited_power ? " unlimited" : null] power bio-chip") diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm index 44be9000c319..d589d34ea973 100644 --- a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm +++ b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm @@ -1,4 +1,3 @@ -#define KW *1000 #define PULSEDEMON_REMOTE_DRAIN_MULTIPLIER 5 #define PD_UPGRADE_HIJACK_SPEED "Speed" @@ -484,4 +483,3 @@ return FALSE return TRUE -#undef KW From 7c30dea299c29334221a1599151932298e5cecbe Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sat, 17 Feb 2024 17:19:29 -0500 Subject: [PATCH 3/3] describes it --- code/_onclick/click_override.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm index 0df45684ee53..a3187aff27d8 100644 --- a/code/_onclick/click_override.dm +++ b/code/_onclick/click_override.dm @@ -71,7 +71,7 @@ var/atom/beam_from = user var/atom/target_atom = A - for(var/i in 0 to 2) + for(var/i in 0 to 2) //3 attempts. Shocks at the clicked source, tries to find a mob in 1 tile, then choses a random tile 1 away to try again. As such, can only hit a mob 2 tiles away from the click beam_from.Beam(target_atom, icon_state = "lightning[rand(1, 12)]", icon = 'icons/effects/effects.dmi', time = 6) if(isliving(target_atom)) var/mob/living/L = target_atom