Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] New non lethal gun - P207 + Fixes to the pepperball gun logistics #5246

Merged
merged 2 commits into from
Dec 18, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#4658

About The Pull Request

Makes some small fixes on the Pepperball gun, which is adding them to the sec vendors in a small amount, properly adding their ammo boxes to the sec tech so they work in the protolathe, incresing the ammo box amount by 3 so its enough for what was intended, two magazines and its weapon load, and improving the description of magazines and ammo box.

Introduces the P207, a non lethal ballistic based gun, which shoots extremely dense rubber like balls that bounce everywhere and impact the target non lethaly. It has the same kind of damage output of a disabler (slightly slower), and trades shooting through glasses and its energy based armor for bouncing off surfaces and ballistic armor (which is more predominant), the weapon is the same size as a pepperbal gun, its obtainable both from cargo and the security vendors, with ammo being obtainable from autolathes and sec protolathes, at the cost of 3 iron and 3 plastic.

Ideally this gun add will be a good example of how to add new guns into the game and how some of the features work.

A known issue for now is that since the system for racking guns changed, we still have to readapt the unracked pistol.

credits to Trelus for the sprites.

Lower cases ammo boxes

How This Contributes To The Nova Sector Roleplay Experience

A somewhat viable purely non lethal option, that security does not depend on cargo to obtain, and the crew can still gets, with quirks that can be detrimental or positive when used like its highly bouncyness, but since it does no collateral much more acceptable to use. In the testing stages it felt really fun to use, and hopefully will enhance the experience during gameplay as well as provide more options for capture.

Also, fixing the pepperguns a bit and making them available to sec even if its on a reduced number felt consistent, which is good for the game.

Proof of Testing

Screenshots/Videos

image

image

image

autolathe:
image

image

image

image

image

image

image

image

inahands, wespe in different hand for comparison

image

image

image

image

image

image

image

image

Changelog

🆑 OrbisAnima
add: Added the new P207 to both cargo sol imports and security vendors, its a completly non lethal pistol that shoots bouncy balls that are more effective against armor than the usual rubber ammunition, comparable to regular ammo. It's ammo its easy enough to produce that autolathes and sec lathes can print it out from start.
qol: Added two pepperball guns to security vendors along with its ammo, increased how much the ammo box holds to 18 and fixed the issue that prevented it from being printable on the sec lathe.
fix: Lower cases the text of ammo boxes to be consistent.
/:cl:

OrbisAnima and others added 2 commits December 17, 2024 23:52
)

* Initial Commit

* Fixes the Light and Manufacturer, and adds Trelus as coauthor

Co-Authored-By: Trelus <[email protected]>

* Fixed typos and review errors!

* adds the base icon to the dmi's to stop some issues with CI

* New sprites by the spriter, should fix the ongoing issues

* doing a workaround because git can be funny with filename case

* minor adjustments, review and unified name to type207 so future generations dont hate me.

* Changed name due to creator request and fixed a typo before extramrdo notes it

* fatfingered ctrl z before ctrl s

* adjust decay on bounce to 10% per bounce

* Update modular_nova/modules/modular_weapons/code/company_and_or_faction_based/bolt_fabrications/ammo.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/modular_weapons/code/company_and_or_faction_based/bolt_fabrications/ammo.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/modular_weapons/code/company_and_or_faction_based/bolt_fabrications/ammo.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/modular_weapons/code/company_and_or_faction_based/bolt_fabrications/ammo.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/modular_weapons/code/company_and_or_faction_based/bolt_fabrications/magazine.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/modular_weapons/code/company_and_or_faction_based/bolt_fabrications/magazine.dm

Co-authored-by: Bloop <[email protected]>

* lower case modular ammo boxes

* Revert "lower case modular ammo boxes"

This reverts commit b4fce35efdebdbec6ec25a493930df3c21c1d447.

---------

Co-authored-by: Trelus <[email protected]>
Co-authored-by: Bloop <[email protected]>
@FeenieRU FeenieRU merged commit aa2094c into master Dec 18, 2024
32 checks passed
AnywayFarus added a commit that referenced this pull request Dec 18, 2024
@Iajret Iajret deleted the upstream-mirror-4658 branch December 21, 2024 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants