Scarborough Arms #3336
Merged
Scarborough Arms #3336
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
github-actions
bot
added
Map Change
rye-rice
changed the title
rye-rice
changed the title
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: rye-rice <[email protected]>
Imaginos16
approved these changes
Sep 12, 2024
|
sorry i was following how professional AAA studios do it |
shiptest-server
pushed a commit
that referenced
this pull request
Sep 12, 2024
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Sep 22, 2024
<!-- 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. --> **IT HELPS TO VIEW THIS AS A COMPLETE REWORK OF SCARBORGH, NOTHING INVIDUALLY WAS REMOVED OR REPLACED. ALL DESIGN CHOICES ARE FINAL** So here it is, the great syndicate guns pr, for @Apogee-dev Luckily, due to my splitting of gun files, this shouldn't conflict with other gun based prs, yayyyy New list of guns: Assume everything not listed here didn't Survive: PC-76 "Ringneck" (Has indie version In Cargo) BC-81 "Asp" PC-81 "Himehabu" R-23 "Viper" (Has indie version In Cargo) MP-84 "Rattlesnake" CMG-20r "Cobra" (Has indie version In Cargo) CDW-81 "Sidewinder" MSR-90 "Boomslang" (Has indie version In Cargo) AMR-83 "Taipan" SG-60rr "Bulldog RR-86 "Mako" "Hydra" and it's variants: SBR-80 "Hydra" SMR-80 "Hydra" SAW-80 "Hydra" Should be the last big gun PR in a while unless i do a quick one for Nanotrasen and Sharplite to help out the big rework thats ongoing. Might do that actually, but hoping to change my focus onto non-gun content soon, the guns were a nice break from all of that. Repaths a ton of things, thats why theres a high file count Misc changes minus the guns that were added - Many, many repaths, a vast majoirty of files changed are maps that have repathed guns - Fixes 556 naming - Redid all toy guns, this seems out of scope but it really isnt as fucking toy guns used the fucking SA sprites - Reduced the price of the scout to 4000 c - reduced the price of 300 magnum to 400 c - Commander has a new firing sound - Various old unused sounds were removed, and some old sounds were remixed to not be stereo - Attachment points for revolvers have been removed - Makes the frontiersmen simplemobs not drop syndicate weapons Credits: https://github.com/tgstation/TerraGov-Marine-Corps for the Gun sounds https://github.com/tgstation/TerraGov-Marine-Corp s/pull/13409 for the Good Gun Sounds @Tamamitsune for the Asp's firing sound @Apogee-dev for writing descs and desiging the Sidewinder PDW, alongside being the brains behind guns as a whole Small sample: Sidewinder was designed by Apogee   :cl: retlaw34, rye-rice, Apogee-dev, generalthrax, Tamamitsune, Nitha(emotional support) add: Scarborough Arms for every syndicate faction add: New sounds for the commander balance: scout's price has been reduced slightly del: Donksoft toy guns fix: You can no longer attach shit to revolvers /:cl: --------- Signed-off-by: rye-rice <[email protected]> Co-authored-by: retlaw34 <[email protected]> Co-authored-by: FalloutFalcon <[email protected]>
MrCat15352
pushed a commit
to MrCat15352/MrCat
that referenced
this pull request
Dec 24, 2024
<!-- 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. --> **IT HELPS TO VIEW THIS AS A COMPLETE REWORK OF SCARBORGH, NOTHING INVIDUALLY WAS REMOVED OR REPLACED. ALL DESIGN CHOICES ARE FINAL** So here it is, the great syndicate guns pr, for @Apogee-dev Luckily, due to my splitting of gun files, this shouldn't conflict with other gun based prs, yayyyy New list of guns: Assume everything not listed here didn't Survive: PC-76 "Ringneck" (Has indie version In Cargo) BC-81 "Asp" PC-81 "Himehabu" R-23 "Viper" (Has indie version In Cargo) MP-84 "Rattlesnake" CMG-20r "Cobra" (Has indie version In Cargo) CDW-81 "Sidewinder" MSR-90 "Boomslang" (Has indie version In Cargo) AMR-83 "Taipan" SG-60rr "Bulldog RR-86 "Mako" "Hydra" and it's variants: SBR-80 "Hydra" SMR-80 "Hydra" SAW-80 "Hydra" Should be the last big gun PR in a while unless i do a quick one for Nanotrasen and Sharplite to help out the big rework thats ongoing. Might do that actually, but hoping to change my focus onto non-gun content soon, the guns were a nice break from all of that. Repaths a ton of things, thats why theres a high file count Misc changes minus the guns that were added - Many, many repaths, a vast majoirty of files changed are maps that have repathed guns - Fixes 556 naming - Redid all toy guns, this seems out of scope but it really isnt as fucking toy guns used the fucking SA sprites - Reduced the price of the scout to 4000 c - reduced the price of 300 magnum to 400 c - Commander has a new firing sound - Various old unused sounds were removed, and some old sounds were remixed to not be stereo - Attachment points for revolvers have been removed - Makes the frontiersmen simplemobs not drop syndicate weapons Credits: https://github.com/tgstation/TerraGov-Marine-Corps for the Gun sounds https://github.com/tgstation/TerraGov-Marine-Corp s/pull/13409 for the Good Gun Sounds @Tamamitsune for the Asp's firing sound @Apogee-dev for writing descs and desiging the Sidewinder PDW, alongside being the brains behind guns as a whole Small sample: Sidewinder was designed by Apogee   :cl: retlaw34, rye-rice, Apogee-dev, generalthrax, Tamamitsune, Nitha(emotional support) add: Scarborough Arms for every syndicate faction add: New sounds for the commander balance: scout's price has been reduced slightly del: Donksoft toy guns fix: You can no longer attach shit to revolvers /:cl: --------- Signed-off-by: rye-rice <[email protected]> Co-authored-by: retlaw34 <[email protected]> Co-authored-by: FalloutFalcon <[email protected]>
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
IT HELPS TO VIEW THIS AS A COMPLETE REWORK OF SCARBORGH, NOTHING INVIDUALLY WAS REMOVED OR REPLACED. ALL DESIGN CHOICES ARE FINAL
So here it is, the great syndicate guns pr, for @Apogee-dev
Luckily, due to my splitting of gun files, this shouldn't conflict with other gun based prs, yayyyy
New list of guns:
Assume everything not listed here didn't Survive:
PC-76 "Ringneck" (Has indie version In Cargo)
BC-81 "Asp"
PC-81 "Himehabu"
R-23 "Viper" (Has indie version In Cargo)
MP-84 "Rattlesnake"
CMG-20r "Cobra" (Has indie version In Cargo)
CDW-81 "Sidewinder"
MSR-90 "Boomslang" (Has indie version In Cargo)
AMR-83 "Taipan"
SG-60rr "Bulldog
RR-86 "Mako"
"Hydra" and it's variants:
SBR-80 "Hydra"
SMR-80 "Hydra"
SAW-80 "Hydra"
Should be the last big gun PR in a while unless i do a quick one for Nanotrasen and Sharplite to help out the big rework thats ongoing. Might do that actually, but hoping to change my focus onto non-gun content soon, the guns were a nice break from all of that.
Repaths a ton of things, thats why theres a high file count
Misc changes minus the guns that were added
Credits:
https://github.com/tgstation/TerraGov-Marine-Corps for the Gun sounds
https://github.com/tgstation/TerraGov-Marine-Corp s/pull/13409 for the Good Gun Sounds
@Tamamitsune for the Asp's firing sound
@Apogee-dev for writing descs and desiging the Sidewinder PDW, alongside being the brains behind guns as a whole
Why It's Good For The Game
Small sample:
Sidewinder was designed by Apogee
Changelog
🆑 retlaw34, rye-rice, Apogee-dev, generalthrax, Tamamitsune, Nitha(emotional support)
add: Scarborough Arms for every syndicate faction
add: New sounds for the commander
balance: scout's price has been reduced slightly
del: Donksoft toy guns
fix: You can no longer attach shit to revolvers
/:cl: