Skip to content

Commit

Permalink
Revert damage changes in "MP QoL: part 1" (#5647)
Browse files Browse the repository at this point in the history
# About the pull request

This PR reverts the damage changes in #5554 

# Explain why it's good for the game

Batons don't need to be more deadly than they were. Tazers do not need
to cause blood effects because of brute damage applied.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

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

</details>


# Changelog
:cl: Drathek
balance: Reverted damage changes to tazers and batons.
/:cl:
  • Loading branch information
Drulikar authored Feb 3, 2024
1 parent bc59ee4 commit aebab28
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions code/datums/ammo/energy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
icon_state = "stun"
damage_type = OXY
flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST|AMMO_ALWAYS_FF //Not that ignoring will do much right now.
damage = 15 //excessive use COULD be lethal
stamina_damage = 40
stamina_damage = 45
accuracy = HIT_ACCURACY_TIER_8
shell_speed = AMMO_SPEED_TIER_1 // Slightly faster
hit_effect_color = "#FFFF00"
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/weapons/stunbaton.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
icon_state = "stunbaton"
item_state = "baton"
flags_equip_slot = SLOT_WAIST
force = 20
force = 15
throwforce = 7
sharp = FALSE
edge = FALSE
throwforce = 10
w_class = SIZE_MEDIUM

attack_verb = list("beaten")
Expand Down

0 comments on commit aebab28

Please sign in to comment.