Skip to content

Commit

Permalink
Scarborough Arms (#3336)
Browse files Browse the repository at this point in the history
<!-- 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. -->

## 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
- 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

## Why It's Good For The Game

Small sample:
Sidewinder was designed by Apogee

![image](https://github.com/user-attachments/assets/b08eb6d9-2d69-4220-a9f4-c1671de247d5)


![image](https://github.com/user-attachments/assets/c99b03ee-efb8-4ecb-82ad-b7b5fa1beeb2)


## Changelog

: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]>
  • Loading branch information
3 people authored Sep 12, 2024
1 parent a492fec commit b44f874
Show file tree
Hide file tree
Showing 120 changed files with 2,177 additions and 1,722 deletions.
6 changes: 3 additions & 3 deletions _maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
pixel_x = 6;
pixel_y = -6
},
/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag{
/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag{
name = "bible gun";
pixel_x = -7;
pixel_y = -8;
Expand Down Expand Up @@ -3198,8 +3198,8 @@
/obj/structure/closet/wardrobe/chaplain_black{
populate = 0
},
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/structure/spacevine{
name = "vines"
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5613,9 +5613,9 @@
/obj/structure/closet,
/obj/item/clothing/suit/armor/ngr/captain,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/turf/open/floor/wood{
icon_state = "wood-broken2"
},
Expand Down Expand Up @@ -5787,9 +5787,9 @@
/area/overmap_encounter/planetoid/jungle/explored)
"Nh" = (
/obj/structure/filingcabinet,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/turf/open/floor/mineral/plastitanium,
/area/ruin/jungle/starport/tower)
"Nj" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3173,7 +3173,7 @@
/obj/structure/closet/cabinet,
/obj/item/hatchet/wooden,
/obj/item/ammo_box/a357,
/obj/item/gun/ballistic/revolver/syndicate,
/obj/item/gun/ballistic/revolver/viper,
/turf/open/floor/wood,
/area/ship/bridge)
"VM" = (
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@
"Il" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/rack,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/turf/open/floor/plating,
/area/ruin/jungle/syndifort)
"Iv" = (
Expand Down Expand Up @@ -1220,8 +1220,8 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small/directional/south,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/turf/open/floor/plating,
/area/ruin/jungle/syndifort)
"My" = (
Expand Down Expand Up @@ -1593,9 +1593,9 @@
/area/ruin/jungle/syndifort)
"WG" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/ballistic/automatic/smg/c20r,
/obj/item/ammo_box/magazine/smgm45,
/obj/item/ammo_box/magazine/smgm45,
/obj/item/gun/ballistic/automatic/smg/cobra,
/obj/item/ammo_box/magazine/m45_cobra,
/obj/item/ammo_box/magazine/m45_cobra,
/turf/open/floor/plating,
/area/ruin/jungle/syndifort/jerry)
"WT" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1115,10 +1115,10 @@
/turf/open/floor/plating,
/area/ruin/unpowered/listening_post)
"te" = (
/obj/item/gun/ballistic/automatic/smg/c20r{
/obj/item/gun/ballistic/automatic/smg/cobra{
spawnwithmagazine = 0
},
/obj/item/ammo_box/magazine/smgm45{
/obj/item/ammo_box/magazine/m45_cobra{
start_empty = 1
},
/obj/structure/guncloset,
Expand Down Expand Up @@ -2345,8 +2345,8 @@
/area/ruin/unpowered/listening_post)
"TM" = (
/obj/structure/closet/cabinet,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4360,7 +4360,7 @@
/area/ruin/lavaland/factory/adminstrative)
"RC" = (
/obj/effect/turf_decal/siding/white,
/obj/item/ammo_box/magazine/m10mm{
/obj/item/ammo_box/magazine/m10mm_ringneck{
start_empty = 1
},
/obj/item/ammo_casing/c10mm{
Expand Down Expand Up @@ -5013,7 +5013,7 @@
/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
/obj/effect/decal/cleanable/blood/old,
/obj/effect/turf_decal/siding/white,
/obj/item/ammo_box/magazine/m10mm{
/obj/item/ammo_box/magazine/m10mm_ringneck{
start_empty = 1
},
/turf/open/floor/concrete/pavement/lava,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -587,12 +587,12 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/ammo_box/magazine/pistolm9mm{
/obj/item/ammo_box/magazine/m9mm_rattlesnake{
pixel_y = 6;
pixel_x = 12;
layer = 3.1
},
/obj/item/ammo_box/magazine/pistolm9mm{
/obj/item/ammo_box/magazine/m9mm_rattlesnake{
pixel_y = 6;
pixel_x = 6;
start_empty = 1;
Expand Down
32 changes: 16 additions & 16 deletions _maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -250,21 +250,6 @@
},
/turf/open/floor/plating,
/area/ruin/powered)
"ga" = (
/obj/structure/table/wood/reinforced,
/obj/item/gun/ballistic/automatic/smg/c20r/toy/riot{
pixel_x = 5;
pixel_y = 7
},
/obj/item/ammo_box/foambox/riot{
pixel_x = -3;
pixel_y = -3
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/grimy,
/area/ruin/powered)
"gp" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
Expand Down Expand Up @@ -1871,6 +1856,21 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"RC" = (
/obj/structure/table/wood/reinforced,
/obj/item/gun/ballistic/automatic/toy{
pixel_x = 5;
pixel_y = 7
},
/obj/item/ammo_box/foambox/riot{
pixel_x = -3;
pixel_y = -3
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/grimy,
/area/ruin/powered)
"RM" = (
/obj/effect/spawner/structure/window/hollow/reinforced,
/turf/open/floor/plating,
Expand Down Expand Up @@ -2968,7 +2968,7 @@ RU
bO
cv
oc
ga
RC
Tl
ko
kU
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2000,9 +2000,9 @@
/obj/structure/closet/crate/secure/gear{
req_one_access_txt = "53"
},
/obj/item/ammo_box/magazine/tec9,
/obj/item/ammo_box/magazine/tec9,
/obj/item/gun/ballistic/automatic/pistol/tec9,
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
/obj/item/storage/pistolcase/ringneck,
/turf/open/floor/plasteel/mono/dark,
/area/ruin/rockplanet/shippingdocksecure)
"rK" = (
Expand Down
10 changes: 3 additions & 7 deletions _maps/RandomRuins/SpaceRuins/corporate_mining.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,8 @@
/area/ruin/space/has_grav/corporatemine/crewquarters)
"nN" = (
/obj/structure/closet/cabinet,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/clothing/under/syndicate/donk,
/obj/item/clothing/suit/hazardvest/donk/qm,
/obj/item/reagent_containers/food/snacks/donkpocket,
Expand Down Expand Up @@ -2035,10 +2035,6 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
"TO" = (
/obj/structure/spawner/burrow/asteroid,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
"TR" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
Expand Down Expand Up @@ -2803,7 +2799,7 @@ Al
Al
Al
VM
TO
Iv
Al
Al
Al
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@
dir = 8
},
/obj/item/paper,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6986,8 +6986,8 @@
/area/centcom/evac)
"cIS" = (
/obj/structure/rack,
/obj/item/gun/ballistic/shotgun/bulldog/inteq,
/obj/item/gun/ballistic/shotgun/bulldog/inteq{
/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq,
/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq{
pixel_x = -5;
pixel_y = -5
},
Expand Down
Loading

0 comments on commit b44f874

Please sign in to comment.