Skip to content

Non-marine melee weapon expansion#18535

Merged
TiviPlus merged 8 commits intotgstation:masterfrom
Lumipharon:civilian_weapons
Dec 14, 2025
Merged

Non-marine melee weapon expansion#18535
TiviPlus merged 8 commits intotgstation:masterfrom
Lumipharon:civilian_weapons

Conversation

@Lumipharon
Copy link
Contributor

@Lumipharon Lumipharon commented Dec 12, 2025

About The Pull Request

Adds a variety of new melee weapons, and updates/improves some existing ones.
Sprites are from Majove 13

image

New weapons:

  • Ice axe
  • Axe
  • Metal pipe x3 (including tire iron)
  • Brass knuckles x3 (including heavy and spiked varieties)
  • Industrial saw
  • Meat cleaver

Updated weapons:

  • Switch blade
  • Fire axe
  • Sledge hammer
  • Katana x2
  • hatchet

The new weapons are largely intended for fluff/map purposes. They've generally been balanced to be actually viable weapons, without being better than proper dedicated ones (i.e. machete).

The industrial saw has its own gimmick however.
It behaves similar to a chainsaw, but the damage doesn't go up when activated, instead it gains armour pen and its attack delay is MASSIVELY reduced. This gives it very high DPS, but its much harder to apply compared to most weapons.

Some of the existing weapons have been buffed for variety.

  • Fire axe does higher damage when wielded
  • The sledge (and glaive) now do massive damage, although the sledge has a very long attack delay
  • The katana's have been folded over 1 million times so now have AP and damage stats more appropriate for their masterful nippon steel (generally going to be worse than a machete except against very high armour opponents)
  • Higher damage on the hatchet

Shivs also properly set as weapons, buffed but made their damage slightly random on init since they're shitty makeshift weapons.

Why It's Good For The Game

More variety of mapside stuff, and makes some stuff not entirely useless.

Changelog

🆑
add: Added a variety of new planet side weapon types
balance: Improved katana, sledge hammer,fire axe and hatchet stats
imageadd: Updates sprites for katanas, sledge hammers, fire axes, hatchet
code: Cleaned up some weapon and two hander code
/:cl:

@github-actions github-actions bot added Code Improvement Changes for adhering to code standards and codebase maintainability. Balance Changes to functionality that modifies how effective certain methods are at powergaming. Feature New interesting mechanics with new interesting bugs labels Dec 12, 2025
@github-actions github-actions bot added the Map Edit One or more changes to .dmm files. label Dec 12, 2025
Copy link
Member

@Xander3359 Xander3359 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are so back.

@TiviPlus TiviPlus merged commit f8ddb97 into tgstation:master Dec 14, 2025
43 checks passed
github-actions bot added a commit that referenced this pull request Dec 14, 2025
@Lumipharon Lumipharon deleted the civilian_weapons branch January 13, 2026 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Balance Changes to functionality that modifies how effective certain methods are at powergaming. Code Improvement Changes for adhering to code standards and codebase maintainability. Feature New interesting mechanics with new interesting bugs Map Edit One or more changes to .dmm files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants