## About The Pull Request
Thankfully not as many bugs or oversights as I previously thought, but
enough to hammer them out all at once. This fixes some incorrect or
missing item descriptions, a few research item names, and a very
important bugfix with the weapon conversion kits.
- Updates description for Renoster shotgun, and Rengo rifle, as they had
the incorrect magazine size listed.
- Adds descriptions for Carbine and Battle Rifle conversion kits.
- Makes the Carbine and Battle Rifle conversion kits not give a full
free mag on crafting.
- Makes the Carbine, Battle Rifle, and Shaytan SMG conversion crafts
require the gun not have a magazine inserted, and the bolt be open to
craft.
- Fixes lathe description and name for Stardust / Advanced Anti Riot
shells, homogenizes name as "Less-Lethal"
- Fixes description on Stardust ammo box.
- Pedantic nitpick renaming WT-550 rubber mags from "Less-Than-Lethal"
to "Less-Lethal", as that was the only use of the term
"Less-Than-Lethal" with any firearm.
- Updates Shaytan gun description to not be a copy of the conversion kit
description. (provided by @Offwrldr / Bangle)
- Updates Shaytan conversion kit name and description in the sec lathe.
- Updates all shotgun ammo boxes to show the proper max ammo count
(which is now 7)
- Reduces cost of Honkshot from 100cr to 25cr (as it now is properly
overridden)
- Standardizes all shotgun ammo boxes to hold 7 rounds (dropping
scatterlaser, hunter, flechette, dragon's breath, hornet's nest,
stardust, pulse slug, and scatter ion from 15 rounds per box, and
honkshot from 35 rounds per box).
## Why It's Good For The Game
As for the descriptions and names, fixing stuff that is blatantly
incorrect or misleading is good. As for the conversion crafts, giving
people free ammo and magazines is anywhere from an unfortunate
oversight, to outright boo-boo-busted.
Consistency for ammo boxes is also good (alongside accurate
descriptions), and I checked with a maintainer in the discord before
updating ammo box values.
## Proof Of Testing
I'm not taking screenshots of descriptions in the lathe, or of items. If
it complies, they're accurate. I do have a video showing the crafts
requiring the guns to have no magazine, and be open bolt though.
https://github.com/user-attachments/assets/9c8313c4-274d-4e7d-9211-7938f595c42f
## Changelog
🆑 Impish_Delights, Bangle
fix: Romulus Carbine, and Romulus Battle-Rifle crafts no longer give
free loaded magazines.
balance: All shotgun ammo boxes now hold 7 rounds. Honkshot is now 25cr
from cargo, down from 100cr.
code: Romulus Carbine, Romulus Battle-Rifle, and Romulus Shaytan kit now
require gun to be empty, and locked open to craft.
spellcheck: Fixes description for Rengo rifle, Renoster shotgun,
Stardust/AAR cartridge box, and Romulus Carbine and Battle-Rifle
conversion kits.
spellcheck: Homogonizes description for Stardust/AAR ammo, and Beanbag
slug ammo as "Less-Lethal"
spellcheck: Changes WT-550 rubber mag to be "Less-Lethal" instead of
"Less-Than_Lethal"
spellcheck: Updates Shaytan SMG description, and conversion kit name and
description in the security lathe.
spellcheck: Updates all shotgun ammo boxes to be accurate.
/🆑
---------
Co-authored-by: Bangle <140950607+Offwrldr@users.noreply.github.com>
## About The Pull Request
Adds a new sidearm to the selection available to the crew, a small
two-shot derringer chambered in .310 Strilka (same ammo used by the bolt
action rifles) and styled as a companion to the Sakhno rifle. This
offers high point-blank burst damage, but is lacking in both ranged
performance, and sustained damage compared to the other options that are
available from cargo.
The Derringer itself has a 75% damage multiplier, and a ~~5%~~ **10%**
damage drop off (per tile) on projectiles fired from it, but otherwise
can still be used at a moderate range as a deterrent. This means it will
deal 45 damage pointblank (assuming the target has no armor, and using
regular .310 ammo), about 9 damage at a screen's distance away, and has
an absolute maximum range of 10 tiles.
The cargo goody pack is ~~1300~~ **~~700~~ 450** credits, putting it
slightly above the plasma projector firearms, and most melee weaponry.
The pack comes with the derringer, and an ammo box with 10 additional
shots.
As a recent change, the derringer also requires a do_after delay to
load, meaning loading a cartridge takes 3/4ths of a second to perform,
to prevent magdumping and being ready to fire immediately.
In addition, it also adds .310 Strilka rubber ammo boxes to the cargo
import market, allowing acquisition of (less-lethal) ammo for it, and
the Sakhno for the general public. It's 50 credits for 10 shots.
## Why It's Good For The Game
This offers a gun that is more heavily tilted towards self-defense, and
requires a bit more thought towards when to use it due to the slight
ammo scarcity (requiring either a hacked lathe to print weaker surplus
rounds, or an ammo workbench). The low capacity and poor damage at range
stops it from being a pocket sniper, while still giving it enough 'oomf'
to justify carrying it as a non-combat focused role.
While it can fire twice in (relatively) quick succession, the lower
damage makes it unable to crit an unarmored crew member; it still deals
a significant amount and leaves them in a vulnerable state, but requires
reloading and gives the victim a chance to retaliate, rather that being
an instant crit or kill.
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
( Screenshots are not upto date in regards to current price, all other
information is correct )
This video below shows the reload delay in action (time is 0.8 seconds,
rather than the 0.75 seconds that is committed currently)
https://github.com/user-attachments/assets/d8769a79-6019-4288-bd00-c343a03a3935
<details>
<summary>Old Damage Dropoff @ 5% per Tile</summary>
</details>
In addition to the GIFs above, I did a small series of wound testing and
general purpose utility actions with the derringer. While surplus ammo
suffers from lower wound chance and immensely reduced damage against
armored targets, it still deals full against structures, unarmored, and
simple mobs.
```
20 trials, 3 tiles between shooter and target, aiming chest, firing twice
1: Skin Breakage (Moderate Chest)
2: Open Puncture (Severe Leg)
3: No Wounds
4: No Wounds
5: Open Puncture (Severe Chest)
6: Skin Breakage x2 (Moderate Chest & Leg)
7: No Wounds
8: No Wounds
9: No Wounds
10: Skin Breakage (Moderate Chest)
11: Skin Breakage (Moderate Chest)
12: Skin Breakage (Moderate Leg)
13: Muscle Tear (Moderate Leg) - Survived Wound
14: Open Puncture (Severe Arm)
15: No Wounds
16: No Wounds
17: No Wounds
18: Skin Breakage (Moderate Chest)
19: No Wounds
20: Skin Breakage (Moderate Arm), Open Puncture (Severe Chest)
9 Unwounded
9 Wounded
2 Double Wounded
3/4 to Crit PB (Affected by Determination from Wounds)
5 to Crit with 3 tiles between shooter and target
8 to Crit with 5 tiles between shooter and target
18 to Crit with 8 tiles between shooter and target
Opens secure locker in 8 PB shots
Breaks reinforced window + grille in 6 PB shots
```
</details>
## Changelog
🆑
add: Adds Yinbi Derringer. Sakhno production 2-shot pistol chambered in
.310 Strilka. Available at cargo for 450 credits.
add: Re-adds .310 Strilka Rubber ammo boxes to the company imports tab,
available for 50 credits.
image: Adds sprite for Yinbi Derringer.
/🆑
---------
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->
## About The Pull Request
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Changelog
<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->
🆑
code: removed unnecessary override as changes were patched upstream
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
## About The Pull Request
Title. This WILL break shit. Probably. Help me sweet Jesus.
## Why It's Good For The Game
House of Leaves is less confusing than our file structure.
## Proof Of Testing
## Changelog
🆑
fix: MASSIVE File Structure clean-up.
/🆑
---------
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
