-
Notifications
You must be signed in to change notification settings - Fork 240
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
Automatic weaponry, Syndicate Items and more! #4181
Open
Syndicat-Meow
wants to merge
11
commits into
Monkestation:master
Choose a base branch
from
Syndicat-Meow:Syndicate_presents_New_weapons!!
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Automatic weaponry, Syndicate Items and more! #4181
Syndicat-Meow
wants to merge
11
commits into
Monkestation:master
from
Syndicat-Meow:Syndicate_presents_New_weapons!!
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
if these are ports, which I believe they are, they need to link and credit the original PR |
done. |
Why? the PR was done and then this came along?! god damnit...
…s_New_weapons!! I was told this was how to fix my issue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
The PR adds 2 new energy guns both being full automatic versions of the disabler and laser, these are meant as side grade and have been tested and balanced to be not better nor worse than their original, the only difference being that it has a faster fire rate, while damage is halfed and capacity doubled. It has been tested with the debuff too.
What is also added is a Syndicate and normal craftable version of a Crossbow that shoots sharpened iron rods, the crossbow can use different types of ammo and the syndicate one comes with a book that allows of crafting of even stronger rod ammo than the normal version. other types of ammo are available viva atmos and a special admin ammo for the crossbows has been added too.
A Syndicate Lipstick has been added, it allows to kiss your target to death, a fancy way to finish off your opponents! Makes a laser like kiss creating lipstick buyable from the uplink!
minor change to the vest and wintercoat of engi to carry the new crossbows or the quiver.
Why It's Good For The Game
It adds new weapons for sec the main part being a cooler disabler for sec to use for quick arrests and a laser for when you need to shoot down a horde of enemies quickly!
Adds new traitor gear with one being a great new weapon that can even be crafted! This allows to spice up the game, give atmos an unique new way to traitor or even help the station using healing crossbow shots! (may entice some RP between atmos and medical.)
Credits (someone told me how to do it so it should work I think)
tgstation/tgstation#78685
tgstation/tgstation#79158
tgstation/tgstation#85249
tgstation/tgstation#78777
tgstation/tgstation#83310
Changelog
🆑
add: Added Disabler SMG available to be ordered from cargo
image: added sprite for Disabler SMG
add: Added Laser Carbine available to be ordered from cargo
image: added sprite for the Laser Carbine
add: Added Syndicate Lipstick! Finish off your opponents with a deadly kiss of death!
add: Added a new trait that comes from using the lipstick
image: added sprite for syndicate lipstick
add: Added two new crossbows one being craftable by crew using and engineering inducer!
add: Added special ammo for the crossbows and a book for stronger normal ammo and their crafting recipes
image: Added sprites of crossbows and ammo
code: changed some code about autofire and minor changes to relavant code
sound: Added a new sound for the crossbow
admin: Added an admin only crossbow bolt =)
/:cl: