Skip to content

Commit

Permalink
Hunter's Pride (shiptest-ss13#2618)
Browse files Browse the repository at this point in the history
![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/c44b78d1-a455-46fc-95d2-20562eed7d9e)

Resprites the entirety of the Hunter's Pride gun manufacturer and adds
some extra weapons, specifically for the SRM.

As Hunter's Pride's lineup also intersects with the SRM weapon lineup,
this was very interesting to do. However, thanks to the SRM lorema and
lorehead in general Valorium for helping clear things up, and as usual
Apogee-dev for any gun-related work I do. Without them this would have
been much harder and much lower quality than how it came out. In fact,
Apogee went above and beyond and designed two entirely original guns for
this, the Firestorm and Vickland!

*"An unconventional submachinegun, rarely issued to Saint-Roumain
Militia mercenary hunters for outstanding situations where normal
hunting weapons fall short. Chambered in .45."*

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/5864d6fc-fb79-4329-a695-79e5360e0a08)

*"The pride of the Saint-Roumain Militia, the Vickland is a rare
semi-automatic battle rifle produced by Hunter's Pride exclusively for
SRM use. It is unusual in its class for its internal rotary magazine,
which must be reloaded using stripper clips. Chambered in .308."*

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/86625ed8-7295-4418-815d-7f1eb8bc7150)

Special thanks to FleetingExpertise for drawing the Ammo box!

Double barreled shotguns and the Beacon (formerly the contender), also
now work like actual break actions! Use the Unique Action key to break
them open, load them up, then hit it again to close them.

Many other weapons are given sawn off options as the new gun
recoil/twohanded mechanics means theres a better tradeoff to sawing them
off rather than haha weapon in bag

Also, disposable guns are now 22lr with 10 round magazines. They're
still horrible, just somewhat less so.

There's various smaller changes in the changelog I probably didn't
mention here, go take a look at them.

Requires shiptest-ss13#2599

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/8285d29f-36e2-43e4-bc2b-4327b18a9570)

:cl: retlaw34, FleetingExpertise, Apogee-dev, Valorium,
add: Resprites almost every single hunter's pride weapon
add: Added the Vickland, SRM equivlent to the ARs except it's an battle
rifle
add: The Illestren is now an en-bloc rifle and uses 8x50mmR.
Functionally it's the exact same to aquire the ammo, just with a
different name
add: You are able to saw off many more guns than before, just be sure to
actually empty it before doing so!
add: Many Hunter's pride weapons have been renamed to something
befitting the lore
add: Break action weapons
fix: Traubuco should work correctly again
fix: Some broken gun onmobs should now show up
tweak: guns tell you how to rack them or switching firing modes
balance: smgs fire 0.02 seconds faster and now have standard pistol
recoil onehanded
balance: disposable guns are now less shit, they now have 10 rounds! The
downside is they are now chambered in 22lr, the worst caliber in the
game
balance: Shotguns have been nerfed to not do an insane amount of damage
point blank and in general

/:cl:
  • Loading branch information
rye-rice authored and MysticalFaceLesS committed Feb 7, 2024
1 parent 9b4db51 commit 56d45c2
Show file tree
Hide file tree
Showing 122 changed files with 988 additions and 769 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_colony.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"NG" = (
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
pixel_x = 13
},
/obj/item/toy/plush/carpplushie{
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3374,7 +3374,7 @@
/obj/structure/cable/orange{
icon_state = "2-10"
},
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/brimstone,
/obj/structure/spacevine,
/turf/open/floor/mineral/plastitanium,
/area/ruin/beach/starwalker)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
"mD" = (
/obj/structure/table/wood,
/obj/machinery/light/small/directional/north,
/obj/item/gun/ballistic/shotgun/winchester,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/turf/open/floor/wood,
/area/ruin/beach)
"mE" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@
/turf/open/floor/plasteel/tech,
/area/ruin/powered/hydroponicslab)
"oo" = (
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
pixel_x = 2;
pixel_y = -3
},
Expand Down Expand Up @@ -1794,7 +1794,7 @@
/area/ruin/powered/hydroponicslab)
"Mz" = (
/obj/effect/decal/cleanable/blood,
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/effect/turf_decal/techfloor{
dir = 4
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
/turf/open/floor/wood,
/area/ruin/powered)
"sC" = (
/obj/item/gun/ballistic/rifle/boltaction,
/obj/item/gun/ballistic/rifle/illestren,
/obj/structure/table/wood,
/obj/item/flashlight/lantern,
/turf/open/floor/wood,
Expand Down
9 changes: 4 additions & 5 deletions _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@
/obj/item/gun/ballistic/shotgun/automatic/combat{
pixel_y = 5
},
/obj/item/gun/ballistic/revolver/nagant{
/obj/item/gun/ballistic/revolver/ashhand{
pixel_y = -1
},
/turf/open/floor/plasteel/tech,
Expand Down Expand Up @@ -1760,13 +1760,12 @@
pixel_x = -3;
pixel_y = -5
},
/obj/item/ammo_box/n762_clip,
/obj/item/ammo_box/n762,
/obj/item/ammo_casing/a4570,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/n762,
/obj/item/ammo_box/n762_clip,
/obj/item/ammo_box/magazine/illestren_a850r,
/obj/item/ammo_box/magazine/illestren_a850r,
/turf/open/floor/plasteel/tech,
/area/ruin/jungle/cavecrew/security)
"vr" = (
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 @@ -745,7 +745,7 @@
/obj/effect/mob_spawn/human/corpse/assistant{
outfit = /datum/outfit/job/chemist
},
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
pixel_y = -13
},
/turf/open/floor/plating/dirt/jungle/wasteland/lit,
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/JungleRuins/jungle_pirate.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
/turf/open/floor/wood,
/area/ruin/unpowered)
"LD" = (
/obj/item/ammo_box/n762,
/obj/item/ammo_box/c45_speedloader,
/obj/structure/table/wood/poker,
/turf/open/floor/wood,
/area/ruin/unpowered)
Expand Down Expand Up @@ -313,9 +313,9 @@
/area/ruin/unpowered)
"Sk" = (
/obj/structure/safe,
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/brimstone,
/obj/item/gun/ballistic/shotgun/brimstone,
/obj/item/gun/ballistic/shotgun/brimstone,
/obj/item/gun/grenadelauncher,
/turf/open/floor/wood,
/area/ruin/unpowered)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@
/obj/structure/table/reinforced,
/obj/item/ammo_casing/shotgun/incendiary,
/obj/item/ammo_casing/shotgun/dragonsbreath,
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/brimstone,
/turf/open/floor/plasteel/cult,
/area/ruin/unpowered)
"OF" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2130,7 +2130,7 @@
pixel_x = 5;
pixel_y = -9
},
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/ruin/powered)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_house.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/area/ruin/unpowered)
"h" = (
/obj/structure/table/wood,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/item/ammo_box/magazine/m45,
/obj/effect/gibspawner/human/bodypartless,
/obj/item/ammo_box/magazine/m45,
Expand Down
28 changes: 14 additions & 14 deletions _maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@
/obj/structure/sign/poster/contraband/tools,
/turf/closed/wall/r_wall/rust,
/area/ruin/unpowered)
"js" = (
/obj/item/chair,
/obj/effect/decal/cleanable/blood,
/obj/item/gun/ballistic/automatic/pistol/candor,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
"lg" = (
/obj/structure/table,
/obj/machinery/microwave,
Expand Down Expand Up @@ -162,6 +168,12 @@
/obj/machinery/vending/mining_equipment,
/turf/open/floor/plasteel/mono,
/area/ruin/unpowered)
"Cy" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/mob_spawn/human/miner,
/obj/item/pickaxe,
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"CL" = (
/obj/structure/sign/poster/random,
/turf/closed/wall/r_wall/rust,
Expand Down Expand Up @@ -262,12 +274,6 @@
},
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
"Qo" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/mob_spawn/human/miner,
/obj/item/pickaxe,
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"Qr" = (
/obj/effect/turf_decal/rechargefloor,
/obj/structure/mecha_wreckage/ripley,
Expand All @@ -293,12 +299,6 @@
/obj/machinery/light/broken/directional/east,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
"TI" = (
/obj/item/chair,
/obj/effect/decal/cleanable/blood,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
"Uu" = (
/obj/machinery/light/broken/directional/north,
/obj/effect/decal/cleanable/oil,
Expand Down Expand Up @@ -448,7 +448,7 @@ tN
(5,1,1) = {"
yZ
yZ
Qo
Cy
yZ
Vw
YN
Expand Down Expand Up @@ -523,7 +523,7 @@ yZ
tN
yZ
Vw
TI
js
Wz
Vw
yZ
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@
/obj/item/ammo_box/magazine/m45{
pixel_x = 7
},
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/turf/open/floor/plating/ashplanet/rocky,
/area/ruin/rockplanet/nanotrasen)
"HG" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_saloon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@
pixel_x = 4;
pixel_y = 6
},
/obj/item/gun/ballistic/shotgun/riot{
/obj/item/gun/ballistic/shotgun/hellfire{
pixel_x = -10;
pixel_y = 2
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@
/area/ruin)
"Df" = (
/obj/structure/table,
/obj/item/gun/ballistic/rifle/boltaction/polymer,
/obj/item/gun/ballistic/rifle/polymer,
/turf/open/floor/concrete,
/area/ruin)
"Di" = (
Expand Down Expand Up @@ -882,7 +882,7 @@
"Hn" = (
/obj/structure/closet/secure_closet/hydroponics,
/obj/item/circuitboard/machine/plantgenes,
/obj/item/gun/ballistic/rifle/boltaction/polymer,
/obj/item/gun/ballistic/rifle/polymer,
/turf/open/floor/wood,
/area/ruin)
"HP" = (
Expand Down Expand Up @@ -923,7 +923,7 @@
/area/overmap_encounter/planetoid/sand/explored)
"Ig" = (
/obj/structure/table,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/candor,
/turf/open/floor/concrete,
/area/ruin)
"Io" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,7 @@
/area/ruin/whitesands/saloon)
"Oc" = (
/obj/structure/closet/cabinet,
/obj/item/gun/ballistic/shotgun/riot,
/obj/item/gun/ballistic/shotgun/hellfire,
/obj/item/storage/box/rubbershot{
pixel_x = -5;
pixel_y = 5
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/bigderelict1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"bI" = (
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
spawnwithmagazine = 0
},
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -1333,7 +1333,7 @@
desc = "A thick gelatinous surface covers the floor. Someone get the golashes.";
name = "gelatinous floor"
},
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
spawnwithmagazine = 0
},
/obj/item/ammo_box/magazine/m45,
Expand Down Expand Up @@ -1493,7 +1493,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/derelictoutpost)
"dJ" = (
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
spawnwithmagazine = 0
},
/obj/structure/alien/weeds{
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/fueldepot.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/brimstone,
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered)
"hL" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/lab4071.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3369,7 +3369,7 @@
pixel_y = -2
},
/obj/item/ammo_box/magazine/m45,
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
pixel_x = -3;
pixel_y = 5
},
Expand Down
Loading

0 comments on commit 56d45c2

Please sign in to comment.