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

LessLethalVend #527

Merged
merged 14 commits into from
Nov 7, 2023
Merged

Conversation

IData-RedactedI
Copy link
Contributor

About the PR

*Added the less lethal alternative to the freedom vend
*Machine stocks a large number of non lethal alternatives, with disruptors, tasers, and rubber bullets

Why / Balance

This is part of the sprite requests

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Nonlethalvend-showcase_scaled_7x_minified

Changelog

🆑 [Data_Redacted]

  • add: A new vending machine has arrived on frontier. Carrying much less lethal weapons, this machine is sure to become a firm favorite for those who aren't blood thirsty killers.

IData-RedactedI and others added 10 commits October 14, 2023 18:50
*Circuitvend Sprite

*Amended vending_machines.yml to show sprite
Added nanotransen and syndicate shredder sprites
-Off
-Idle
-Shredding money
-not shredding anything
Even better JSON
…station-14 into Ammovend-v2

# Conflicts:
#	Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json
#	Resources/Textures/_NF/Structures/Machines/shredder.rsi/normal.png
#	Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json
It works
Copy link
Contributor

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

Good work on those!

But... the Taser should not be in the list, its extremly overpowred.
Taser should be a loot kept for vaults/events/ect..., that why they were replaced with the disabler in most servers.

Tho i think the Taser is a 1 or 2 slot in emag would be good also.

@IData-RedactedI
Copy link
Contributor Author

Good to know about the taser. Is there a anything against it holding batons?

@RealIHaveANameOfficial
Copy link
Contributor

calling this an "ammovend" seems like a misnomer given the contents of the vender. Maybe rename it to "Pacivend" or something, as in "pacify"?

@IData-RedactedI
Copy link
Contributor Author

Taser has been removed

@IData-RedactedI IData-RedactedI changed the title Ammovend v2 LessLethalVend Nov 6, 2023
-Added
*Beanbag and Mosin rubbers
*Darts to the contraband inventory (I think its funny)
*Practice shotgun shells to emag

*Added a flare gun as a alternative to the double barrel
     -May need to tweak the prices of weapons in the vend, flare, pisol, and disabler at $5000 currently
@Cheackraze Cheackraze merged commit 1b68e5f into new-frontiers-14:master Nov 7, 2023
8 of 12 checks passed
FrontierATC added a commit that referenced this pull request Nov 7, 2023
@IData-RedactedI IData-RedactedI deleted the Ammovend-v2 branch November 17, 2023 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants