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

This commit is contained in:
xPokee
2025-09-24 10:13:01 -04:00
313 changed files with 6548 additions and 4624 deletions
@@ -168,7 +168,7 @@
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
backpack_contents = list(
/obj/item/grenade/smokebomb = 2,
/obj/item/ammo_box/strilka310 = 2,
/obj/item/ammo_box/speedloader/strilka310 = 2,
)
/datum/outfit/deathmatch_loadout/battler/druid
@@ -1054,8 +1054,8 @@
belt = /obj/item/storage/belt/unfathomable_curio
gloves = null
shoes = /obj/item/clothing/shoes/winterboots/ice_boots
l_pocket = /obj/item/ammo_box/strilka310/lionhunter
r_pocket = /obj/item/ammo_box/strilka310/lionhunter
l_pocket = /obj/item/ammo_box/speedloader/strilka310/lionhunter
r_pocket = /obj/item/ammo_box/speedloader/strilka310/lionhunter
back = /obj/item/gun/ballistic/rifle/lionhunter // for his neutral b, he wields a gun