diff --git a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm index 8a595f8d9e..f7c2c08e06 100644 --- a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm +++ b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm @@ -166,7 +166,7 @@ src << "We require more chemicals to electrocute [S]!" return 0 - S.electrocute_act(60 * siemens,src,1.0) //If only they had surge protectors. + S.electrocute_act(60,src,0.75) //If only they had surge protectors. if(siemens) visible_message("Arcs of electricity strike [S]!", "Our hand channels raw electricity into [S]", diff --git a/code/game/gamemodes/technomancer/instability.dm b/code/game/gamemodes/technomancer/instability.dm index 8f9eebeb17..4b04330b5b 100644 --- a/code/game/gamemodes/technomancer/instability.dm +++ b/code/game/gamemodes/technomancer/instability.dm @@ -115,7 +115,7 @@ rng = rand(0,4) switch(rng) if(0) - electrocute_act(instability * 0.3, "unstable energies") + electrocute_act(instability * 0.3, "unstable energies", 0.75) if(1) adjustFireLoss(instability * 0.15) //7.5 burn @ 50 instability src << "Your chassis alerts you to overheating from an unknown external force!" @@ -132,7 +132,7 @@ rng = rand(0,3) switch(rng) if(0) - electrocute_act(instability * 0.5, "extremely unstable energies") + electrocute_act(instability * 0.5, "extremely unstable energies", 0.75) if(1) emp_act(2) if(2) @@ -146,7 +146,7 @@ rng = rand(0,4) switch(rng) if(0) - electrocute_act(instability, "extremely unstable energies") + electrocute_act(instability, "extremely unstable energies", 0.75) if(1) emp_act(1) if(2) diff --git a/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm b/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm index 2cc1b5d73f..9cf8435de1 100644 --- a/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm @@ -38,7 +38,7 @@ var/obj/item/organ/external/affected = H.get_organ(check_zone(BP_TORSO)) H.electrocute_act(power, src, H.get_siemens_coefficient_organ(affected), affected) else - L.electrocute_act(power, src, 1.0, BP_TORSO) + L.electrocute_act(power, src, 0.75, BP_TORSO) adjust_instability(3) \ No newline at end of file diff --git a/code/game/gamemodes/technomancer/spells/energy_siphon.dm b/code/game/gamemodes/technomancer/spells/energy_siphon.dm index e5c83c91b6..92ca2d4270 100644 --- a/code/game/gamemodes/technomancer/spells/energy_siphon.dm +++ b/code/game/gamemodes/technomancer/spells/energy_siphon.dm @@ -195,7 +195,7 @@ var/obj/item/organ/external/affected = H.get_organ(check_zone(BP_TORSO)) H.electrocute_act(power, src, H.get_siemens_coefficient_organ(affected), affected) else - target_mob.electrocute_act(power, src, 1.0, BP_TORSO) + target_mob.electrocute_act(power, src, 0.75, BP_TORSO) return 0 // Since this is a continous beam, it needs to keep flying until it hits the Technomancer. diff --git a/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm b/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm index 5b45105038..a1fe5f0f78 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm @@ -41,7 +41,7 @@ var/obj/item/organ/external/affected = H.get_organ(check_zone(BP_TORSO)) H.electrocute_act(power, src, H.get_siemens_coefficient_organ(affected), affected) else - target_mob.electrocute_act(power, src, 1.0, BP_TORSO) + target_mob.electrocute_act(power, src, 0.75, BP_TORSO) hit_mobs |= target_mob //Each bounce reduces the damage of the bolt. diff --git a/code/game/gamemodes/technomancer/spells/projectile/lightning.dm b/code/game/gamemodes/technomancer/spells/projectile/lightning.dm index f6db21da25..1f4ef51892 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/lightning.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/lightning.dm @@ -38,5 +38,5 @@ var/obj/item/organ/external/affected = H.get_organ(check_zone(BP_TORSO)) H.electrocute_act(power, src, H.get_siemens_coefficient_organ(affected), affected) else - target_mob.electrocute_act(power, src, 1.0, BP_TORSO) + target_mob.electrocute_act(power, src, 0.75, BP_TORSO) return 1 \ No newline at end of file diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index d2bd9210bb..f84021b26a 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -75,13 +75,13 @@ /mob/living/silicon/stun_effect_act(var/stun_amount, var/agony_amount) return //immune -/mob/living/silicon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0) +/mob/living/silicon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 0.0) if(shock_damage > 0) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(5, 1, loc) s.start() - shock_damage *= 0.75 //take reduced damage + shock_damage *= siemens_coeff //take reduced damage take_overall_damage(0, shock_damage) visible_message("[src] was shocked by \the [source]!", \ "Energy pulse detected, system damaged!", \