Alexis 88e84645b1 Merge commit '6b52b564a50e4f3091470529c683587e5de15d49' into upstream-sync-7-22-2026

2026-07-22 13:39:09 -04:00

..

_incendiary.dm

…

cannonball.dm

…

dart_syringe.dm

…

dnainjector.dm

…

foam_dart.dm

…

grenade.dm

…

junk.dm

Pipeguns are more lethal. Good luck. (#96769)

2026-07-11 15:58:37 +01:00

lmg.dm

…

pistol.dm

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

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

revolver.dm

…

rifle.dm

The Second Coming of the Rebar Crossbow (#96525)

2026-07-03 10:47:20 +10:00

shotgun.dm

…

smg.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

sniper.dm

…

special.dm

…