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

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

..

bows

Bow revisit; they hit harder, there are more sprites, there is a new bow made of bone. Really live that ranger fantasy. (#92809)

2025-09-14 14:00:23 -04:00

guns

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

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

48x.dmi

Siege Warfare: Adds two new craftable emplaced guns, a bigger laser musket, and a new spear for crew-sided mining. (#94102)

2025-12-21 03:03:54 +00:00

bat.dmi

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

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

baton.dmi

Fix alt stunsword skin (#94979)

2026-01-26 00:38:33 -05:00

cannons.dmi

Ballista adjustments (#94724)

2026-01-15 20:45:43 +00:00

chainsaw.dmi

…

changeling_items.dmi

…

cleric_mace.dmi

…

club.dmi

…

fireaxe.dmi

…

flamethrower.dmi

…

giant_wrench.dmi

…

goliath_hammer.dmi

…

grenade.dmi

Readds sovlful IEDs and adds assembly beakerbombs (#94965)

2026-01-28 09:11:50 +13:00

hammer.dmi

…

hand.dmi

…

improvised.dmi

NT researchers make shocking breakthrough in flux anomalogics! Tesla Cannon Resprite / Resound (#92031)

2025-08-19 22:35:58 -04:00

khopesh.dmi

…

naval_cannon.dmi

Adds a naval cannon to a naval ship. (#95745)

2026-04-19 23:01:11 +01:00

Nightmare_items.dmi

New sprites for Nightmare and Shadow people + unique sprites for Light Eater and heart of darkness (#94912)

2026-01-29 15:10:05 +01:00

pneumaticCannon.dmi

…

restraints.dmi

Reworks goliaths, slightly changes watchers/legions/brimdemons/lobstrocities (#96028)

2026-05-12 19:16:02 +01:00

ritual_weapon.dmi

…

shields.dmi

…

spear.dmi

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

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

stabby_wide.dmi

…

stabby.dmi

…

staff.dmi

…

sword.dmi

Polishes some old swords (#94343)

2025-12-25 10:05:32 +01:00

thrown.dmi

Removes Ninja EMP burst / Adds Ninja EMP shurikens (#92899)

2025-09-15 17:28:53 -04:00

transforming_energy.dmi

Adds the surplus energy sword; the mall katana of the future. (#92544)

2025-08-21 20:08:50 +02:00

turrets.dmi

…

voidwalker_items.dmi

…

whip.dmi

The whipping (#92122)

2025-08-19 22:33:52 -04:00