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

This commit is contained in:
xPokee
2025-10-04 05:28:09 -04:00
67 changed files with 1444 additions and 796 deletions
@@ -12,7 +12,7 @@
max_ammo = 4
/obj/item/ammo_box/magazine/internal/shot/tube/fire
ammo_type = /obj/projectile/bullet/incendiary/shotgun/no_trail
ammo_type = /obj/item/ammo_casing/shotgun/incendiary/no_trail
/obj/item/ammo_box/magazine/internal/shot/tube/buckshot
ammo_type = /obj/item/ammo_casing/shotgun/buckshot