Skip to content

Commit

Permalink
g2 electroshock balance (#7608)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# About the pull request

reduces stam damage to humans, fixes bracer energy drain

# Explain why it's good for the game
bugfix and the stam dmg was crazy high resaulting in huge stuns and long
slow durations on humans


# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->

<!-- !! If you are modifying sprites, you **must** include one or more
in-game screenshots or videos of the new sprites. !! -->

<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
label your changes in the changelog. Please note that maintainers freely
reserve the right to remove and add tags should they deem it
appropriate. You can attempt to finagle the system all you want, but
it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Maintainers freely reserve the right to remove and add
tags should they deem it appropriate. -->

:cl:
balance: reduces g2 electroshock grenade stamina damage
fix: yauta bracers get properly drained by emp
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->

---------

Co-authored-by: vincibrv <[email protected]>
Co-authored-by: Drathek <[email protected]>
  • Loading branch information
3 people authored Nov 18, 2024
1 parent 4b39def commit 9e33c9a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions code/game/objects/items/explosives/grenades/marines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -485,9 +485,9 @@
/// Factor to mutiply the effect range has on damage.
var/falloff_dam_reduction_mult = 20
/// Post falloff calc damage is divided by this to get xeno slowdown
var/xeno_slowdown_numerator = 12
var/xeno_slowdown_numerator = 11
/// Post falloff calc damage is multipled by this to get human stamina damage
var/human_stam_dam_factor = 0.9
var/human_stam_dam_factor = 0.5

/obj/item/explosive/grenade/sebb/get_examine_text(mob/user)
. = ..()
Expand Down Expand Up @@ -613,14 +613,14 @@
mob.apply_damage(damage_applied, BURN)
if((mob_dist < (range-3))) // 2 tiles around small superslow
mob.Superslow(2)
mob.Slow(damage_applied/11)
mob.Slow(damage_applied/xeno_slowdown_numerator)

if(mob_dist < 1) // Range based stuff, standing ontop of the equivalent of a canned lighting bolt should mess you up.
mob.Superslow(3) // Note that humans will likely be in stamcrit so it's always worse for them when ontop of it and we can just balancing it on xenos.
mob.eye_blurry = damage_applied/4
mob.Daze(1)
else if((mob_dist < (range-1)) && (mob.mob_size < MOB_SIZE_XENO_VERY_SMALL)) // Flicker stun humans that are closer to the grenade and larvas too.
mob.apply_effect(1 + (damage_applied/100),WEAKEN) // 1 + damage/40
mob.apply_effect(1 + (damage_applied/100),WEAKEN) // 1 + damage/100
mob.eye_blurry = damage_applied/8

else
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_preds/yaut_bracers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@

/obj/item/clothing/gloves/yautja/hunter/emp_act(severity)
. = ..()
charge = max(charge - (severity * 500), 0)
charge = max(charge - (1000/severity), 0) //someone made weaker emp have higer severity so we divide
if(ishuman(loc))
var/mob/living/carbon/human/wearer = loc
if(wearer.gloves == src)
Expand Down

0 comments on commit 9e33c9a

Please sign in to comment.