Commit Graph

25 Commits

Author SHA1 Message Date
vanx
d12c37cbf5 [Add] More Weapons Locale (#569)
* russia number 1

* omg wtf

* ok

* a

* review

* fix

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-06-19 19:56:02 +03:00
vanx
2fb1e40412 [Fix] Damage Modifiers on Examine + Locale (#549)
* dmg modifier + cleanup

* Update Resources/Locale/ru-RU/weapons/ranged/gun.ftl

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update gun.ftl

* wwdp edit end

---------

Co-authored-by: vanx <discord@vanxxxx>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
2025-06-06 18:14:25 +03:00
Spatison
7afa302e78 upstream fix 2025-03-21 19:51:32 +03:00
VMSolidus
935a4165c7 Shotgun Variation (#1997)
# Description

A longstanding request by @OldDanceJacket
This PR introduces several new datafields for guns, allowing guns to
influence some of the characteristics of projectiles directly. Guns can
now change the damage, shotgun spread, shotgun projectile amount, and
even change the spread style of projectiles. This is currently used--
for demonstration purposes, by the Sawn-off shotgun, the Kammerer, and
the Energy Shotgun.

Shotguns now have a "More random" style of spread, where each individual
pellet in the cone can have its own spread angle independent of other
pellets, meaning the damage is less predictable at range, with more
variation(you can sometimes get more or less pellets hitting the
target). However, "Laser Shotguns" such as the Warden's E-Shotgun use
the classic spread behavior!

<details><summary><h1>Media</h1></summary>
<p>

https://github.com/user-attachments/assets/766254c0-258c-462c-bed0-81fd2dd930f2

</p>
</details>

# Changelog

🆑
- tweak: Most shotguns now have a new "More random" spread pattern.
Instead of a perfect fan of projectiles, each projectile has its own
random path inside the arc. "Laser Shotguns" like the E-Shotgun use the
classic "Perfect fan" style of spread.
- tweak: The Kammerer now has a hunting choke, giving it a noticeably
tighter spread than other shotguns.
- tweak: The sawn-off shotgun now has a significantly wider
spread(Making hitting anything reliably beyond 3 tiles quite hard). As a
trade-off, it's now a bit like a Super Shotgun. Its projectiles deal 50%
bonus damage.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

(cherry picked from commit de740f808773221dff9f730a27f640ed756e9460)
2025-03-21 17:25:56 +03:00
vanx
cce56e56ce [Tweak] The Gunnening (#285)
* wrapped examine (pretty)

* so mentally done

* remove ammo counters

* fix

* the soundening

* less visual recoil

* rifle fixes

* the soundening 2

* i loved # WWDP too much

* review fixes

* fix mag visuals

* top round examine

---------

Co-authored-by: vanx <discord@vanxxxx>
Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2025-03-08 10:35:03 +02:00
VMSolidus
1666157a0d Two New .25 Caseless Guns (#1794)
# Description

This PR adds a new integrally suppressed submachine gun to the game,
which is called the FPA-90. It is notably the first automatic weapon to
fire the .25 caseless ammo type, which it does so in extremely quick 3
round bursts with a moderate cooldown between bursts. This item can be
either obtained from the Syndicate Uplink where it's intended primarily
for "Stealth Ops" nukies, or it can be manufactured after researching
Advanced Weapons in Arsenal T3, for a fairly sizeable amount of
aluminium and steel.

Since Security could not previously print .25 caseless, this PR also
adds the ability to print caseless rifle magazines. Also included for
the uplink are a variety of magazines for the FPA-90(and other weapons).

For the crew side of things, there is also the bullpup caseless
integrally supressed assault rifle, called the BRDI-R25. Unlike the
FPA-90, it requires wielding to be used effectively. It's currently
obtained via Prototype Weapons in arsenal t3, and then manufactured at a
security techfab. The BRDI has two radically different firing modes, a 5
round burst with extreme rate of fire and poor accuracy, and an auto
mode that has much lower firing rate and more manageable recoil.
Essentially, we have a "Fuller-Auto" gun.

There is also a unique antique BRDI-R25 available to the Head of
Security via his special weapon loadout picks.

<details><summary><h1>Media</h1></summary>
<p>
Available in research

![image](https://github.com/user-attachments/assets/5b28f1f8-f954-4eea-895f-c18f0905a2ac)

And in the uplink catalog

![image](https://github.com/user-attachments/assets/b5e1cd96-5592-462f-85a4-436ecd5744d2)

![image](https://github.com/user-attachments/assets/a92691b7-f1f4-44b7-9782-462d284d0932)

In the techfab(after researching it)

![image](https://github.com/user-attachments/assets/a6d56942-2987-4a59-8e04-b069edbb31b1)

Firing it:

https://github.com/user-attachments/assets/fd82df27-bf26-4351-be9d-c4da71d8a0e2

</p>
</details>

# Changelog

🆑
- add: Added the FPA-90, an integrally supressed submachine gun. It can
be found either in the syndicate uplink, or manufactured at a security
techfab after Epistemics unlocks Advanced Weapons.
- add: Added the BRDI-R25, an integrally supressed bullpup rifle
chambered in .25 Caseless. It has an "Extremely fast" burst fire mode,
and a "More controllable" full-auto/semi mode. Unlike the FPA-90, it is
not available to syndicate agents. It can be manufactured after
researching Prototype Weapons.
- add: Antique variant of the BRDI-R25, which can be taken by the Head
of Security as his personal weapon.
- add: Added a variety of different ammunition options to Syndicate
uplinks.
- add: Security Techfabs can now manufacture .25 caseless rifle ammo and
magazines.

(cherry picked from commit 6647eca1041b550ab4569b434e80cd0b7c20099a)
2025-02-28 16:22:24 +03:00
VMSolidus
30fa1207b2 Update Submodule to 219.2.0 (#536)
Uses the following Cherry-Picks:
https://github.com/space-wizards/space-station-14/pull/26994
https://github.com/space-wizards/space-station-14/pull/26518
https://github.com/space-wizards/space-station-14/pull/26279
https://github.com/space-wizards/space-station-14/pull/24946
https://github.com/space-wizards/space-station-14/pull/27188

Requires:
https://github.com/Simple-Station/Einstein-Engines/pull/535
https://github.com/Simple-Station/Einstein-Engines/pull/534

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Jake Huxell <JakeHuxell@pm.me>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: DEATHB4DEFEAT <zachcaffee@outlook.com>
2024-07-11 17:40:02 -07:00
DrSmugleaf
5329280378 Add events for GunComponent values, muzzle flashes and cartridge spread (#24077)
* Add a modifier event for GunComponent values

* Add docs

* Add VV readwrite to modified values

* Add more docs

* More docs

* Add Gun parameter to GunRefreshModifiersEvent

* Add another event for handling cartridge spread

* Fix pneumatic speed

(cherry picked from commit 4e8b1fb0d3ef23c79ea3ca0cec05932de03601f5)
2024-02-08 11:52:29 +01:00
Kara
03b3e36d43 Examine prediction (#23565)
* Initial prediction

* new group handling

* groups for all examines that use multiple rn

* compile

* why was it doing this??

* handle newlines with sorting properly

(cherry picked from commit 0ae3858b69b695697ea9300609460f8ddb70ebbf)
2024-01-26 21:48:02 +01:00
Nemanja
99cb2627bd multi-gun nerf (#20194) 2023-09-27 21:59:12 +02:00
DrSmugleaf
c71f97e3a2 Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
DrSmugleaf
a88e747a0b Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
metalgearsloth
d2123964a1 Truncate gun firerates (#18413)
screenshots-and-videos is the new bug channel.
2023-07-29 00:09:43 -06:00
metalgearsloth
e755509fc7 More miscellaneous compiler warning fixes (#18228) 2023-07-23 16:03:57 +10:00
metalgearsloth
ae01618874 Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209 Revert "Replace ResourcePath with ResPath (#15308)" (#15551) 2023-04-20 11:43:54 +10:00
Ygg01
71f358a027 Replace ResourcePath with ResPath (#15308) 2023-04-19 23:39:17 +10:00
Leon Friedrich
29ad3e50ac Fix weapon cooldown serialization while mapping (#15123) 2023-04-05 17:37:50 -06:00
metalgearsloth
330bb7bb14 Remove gun .Owners (#14585) 2023-03-11 20:08:22 +11:00
metalgearsloth
44fb8a9e2d Fix rsi sprite access for verbs (#14284) 2023-02-26 18:48:57 +11:00
Nemanja
a66790f158 fix emitter examining (#13369) 2023-01-10 22:48:05 +11:00
metalgearsloth
600c0e3255 Fix a few warnings (#11576) 2022-10-04 14:24:19 +11:00
metalgearsloth
5cdec951c7 Only show gun examines in detail range (#10697)
The most important 2 are fire mode and how much ammo is left.
2022-08-23 09:04:50 -05:00
metalgearsloth
93efa6c3b8 Fix some unneeded debug logs (#10485)
2 data definitions + NPCs.
2022-08-14 21:23:23 -07:00
metalgearsloth
fb943a61dc Gun refactor (#8301)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-01 19:59:58 +10:00