Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

This commit is contained in:
Roxy
2025-11-12 16:44:13 -05:00
379 changed files with 37535 additions and 33147 deletions
@@ -145,7 +145,7 @@
availability_prob = 35
/datum/market_item/weapon/surplus_esword
name = "Type I 'Iaito' Energy Sword"
name = "Pattern I 'Iaito' Energy Sword"
desc = "A mass-produced energy sword. It is functionally worse than a milspec energy sword commonly found amongst paramilitary organizations. \
But hey, better than nothing. Does have some power supply problems, but nothing that a bit of percussive maintenance can't fix."
item = /obj/item/melee/energy/sword/surplus