Merge branch 'master' of https://github.com/tgstation/tgstation into xpokee-test-upstream-sync

This commit is contained in:
xPokee
2025-09-10 14:12:16 -04:00
277 changed files with 8854 additions and 7401 deletions
@@ -127,6 +127,7 @@
obj_damage = 11
melee_damage_lower = 0
melee_damage_upper = 0
melee_attack_cooldown = CLICK_CD_MELEE
sharpness = NONE //it's made of butter
armour_penetration = 0
response_harm_continuous = "takes a bite out of"