shayoki f601a6ddaf Merge remote-tracking branch 'tgstation/master' into upstream-6-2-2026

2026-06-03 01:23:54 -05:00

..

baseball_bat.dm

…

baton.dm

Adds deep lore to some pistols, and partially rewrites the baton lore. Repaths some items. (#96056)

2026-06-01 20:33:27 -05:00

chainofcommand.dm

[MDB IGNORE] [IDB IGNORE] Upstream Sync - 04/17/2026 (#5453)

2026-05-16 00:56:00 +02:00

chainsaw.dm

…

claymore.dm

…

dualsaber.dm

…

energy.dm

…

fireaxe.dm

…

high_frequency_blade.dm

…

his_grace.dm

…

katana.dm

…

knives.dm

…

misc.dm

Bane refactor (now uses damage multipliers) (#96003)

2026-05-16 11:41:29 +10:00

powerfist.dm

…

sabre.dm

Bane refactor (now uses damage multipliers) (#96003)

2026-05-16 11:41:29 +10:00

soulscythe.dm

Streamlines Life() a little (#96215)

2026-05-29 22:48:16 -06:00

spear.dm

Merge remote-tracking branch 'tgstation/master' into upstream-6-2-2026

2026-06-03 01:23:54 -05:00

supermatter_sword.dm

…