Revert damage changes in #5554

cmss13-devs · Feb 3, 2024 · 21ab600 · 21ab600
1 parent 7846f41
commit 21ab600
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/code/datums/ammo/energy.dm b/code/datums/ammo/energy.dm
@@ -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"

diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
@@ -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")